Merge branch 'winlob' into 3049

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

Branch: refs/heads/master
Commit: 2822a38904613918994e190de6fc21efd3d4b99f
Parents: 4eb52c1 20724db
Author: Weixin-Xu <[email protected]>
Authored: Wed Jul 25 10:09:14 2018 +0800
Committer: Weixin-Xu <[email protected]>
Committed: Wed Jul 25 10:09:14 2018 +0800

----------------------------------------------------------------------
 .gitattributes                                  |     2 +
 .gitignore                                      |     1 +
 .rat-excludes                                   |    13 +-
 RAT_README                                      |     3 +-
 core/.gitignore                                 |     2 +-
 .../jdbcT4/src/main/java/T4Messages.properties  |    22 +-
 .../jdbc/t4/CONNECTION_CONTEXT_def.java         |     1 +
 .../java/org/trafodion/jdbc/t4/Certificate.java |     4 +-
 .../main/java/org/trafodion/jdbc/t4/Cipher.java |     8 +-
 .../jdbc/t4/InitializeDialogueMessage.java      |     3 +-
 .../trafodion/jdbc/t4/InterfaceConnection.java  |    25 +-
 .../trafodion/jdbc/t4/InterfaceResultSet.java   |   109 +-
 .../trafodion/jdbc/t4/InterfaceStatement.java   |    62 +-
 .../main/java/org/trafodion/jdbc/t4/Key.java    |     8 +-
 .../org/trafodion/jdbc/t4/MessageDigest.java    |     2 +-
 .../main/java/org/trafodion/jdbc/t4/SecPwd.java |     2 +-
 .../java/org/trafodion/jdbc/t4/Security.java    |     2 +-
 .../trafodion/jdbc/t4/SecurityException.java    |    11 +-
 .../org/trafodion/jdbc/t4/T4DSProperties.java   |     3 +
 .../trafodion/jdbc/t4/T4DatabaseMetaData.java   |    10 +-
 .../org/trafodion/jdbc/t4/T4Properties.java     |    51 +-
 .../java/org/trafodion/jdbc/t4/TRANSPORT.java   |     1 +
 .../org/trafodion/jdbc/t4/TrafT4Connection.java |    65 +-
 .../jdbc/t4/TrafT4PreparedStatement.java        |    29 +-
 .../org/trafodion/jdbc/t4/TrafT4ResultSet.java  |    14 +-
 .../org/trafodion/jdbc/t4/TrafT4Statement.java  |     9 +-
 .../main/samples/BatchSample/BatchSample.java   |   119 +
 .../src/main/samples/BatchSample/README.md      |   146 +
 .../main/samples/TransactionSample/README.md    |    55 +
 .../TransactionSample/TransactionSample.java    |   163 +
 .../src/main/samples/common/sampleUtils.java    |    18 +
 .../jdbcT4/src/main/samples/t4jdbc.properties   |     2 +-
 core/conn/jdbc_type2/native/Debug.cpp           |    64 +-
 .../jdbc_type2/native/SQLMXCommonFunctions.cpp  |     9 +
 core/conn/jdbc_type2/native/SqlInterface.cpp    |    12 +-
 .../jdbc_type2/samples/TransactionMode.java     |     2 +-
 .../trafodion/jdbc/t2/SQLMXDataSource.java      |     2 +-
 .../org/apache/trafodion/jdbc/t2/SQLMXDesc.java |     4 +-
 .../jdbc/t2/SQLMXPreparedStatement.java         |    94 +-
 core/conn/odb/Makefile                          |     9 +-
 core/conn/odb/odb/odb.vcxproj                   |   342 +-
 core/conn/odb/odb/odb.vcxproj.filters           |    92 +-
 core/conn/odb/src/JsonReader.c                  |   598 +
 core/conn/odb/src/JsonReader.h                  |   301 +
 core/conn/odb/src/odb.c                         |   863 +-
 core/conn/odbc/src/odbc/Common/ExpConvMxcs.cpp  |     4 +-
 core/conn/odbc/src/odbc/Common/Global.h         |    20 +-
 core/conn/odbc/src/odbc/Common/Listener.h       |     9 +-
 .../odbc/src/odbc/Common/ODBCMXTraceMsgs.cpp    |     6 +-
 core/conn/odbc/src/odbc/Common/linux/sqmem.cpp  |     2 +-
 .../odbc/Krypton/generated_incs/odbcCommon.h    |     1 +
 .../odbc/nsksrvr/Interface/Listener_srvr.cpp    |    31 +-
 .../src/odbc/nsksrvr/Interface/Listener_srvr.h  |     4 +-
 .../Interface/linux/Listener_srvr_ps.cpp        |    86 +-
 .../src/odbc/nsksrvr/Interface/odbcs_srvr.cpp   |     1 +
 core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp |   636 +-
 core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h   |     3 +-
 core/conn/odbc/src/odbc/nsksrvr/SrvrMain.cpp    |   107 +-
 core/conn/odbc/src/odbc/nsksrvr/SrvrSMD.cpp     |     6 -
 core/conn/odbc/src/odbc/nsksrvrcore/Makefile    |     2 +-
 .../odbc/src/odbc/nsksrvrcore/SQLWrapper.cpp    |     5 +-
 .../odbc/src/odbc/nsksrvrcore/sqlinterface.cpp  |    25 +-
 .../conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h |     2 -
 .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp    |   534 +-
 core/conn/trafci/Makefile                       |     6 +-
 core/conn/trafci/install/Installer.java-tmpl    |    26 +-
 core/conn/trafci/lib/python/Session.py          |     2 +
 core/conn/trafci/samples/sampleDDL.py           |     1 +
 core/conn/trafci/samples/sampleDML.py           |     1 +
 core/conn/trafci/samples/sampleTables.py        |     1 +
 .../java/org/trafodion/ci/DatabaseQuery.java    |     1 +
 .../java/org/trafodion/ci/ParseArguments.java   |     3 +
 .../java/org/trafodion/ci/SessionInterface.java |     2 +-
 .../java/org/trafodion/ci/UserInterface.java    |     2 +-
 core/conn/trafci/utils/trafci                   |    24 +-
 core/conn/trafci/utils/trafci.sh-tmpl           |    61 +-
 .../unixcli/DrvrManager/drvrmanager.cpp         |     2 +
 .../odbc/odbcclient/unixcli/cli/cconnect.cpp    |    11 +-
 .../odbc/odbcclient/unixcli/cli/chandle.cpp     |     5 +-
 .../odbc/odbcclient/unixcli/cli/ctosqlconv.cpp  |    15 +-
 .../odbc/odbcclient/unixcli/cli/drvrglobal.cpp  |   112 +-
 .../odbc/odbcclient/unixcli/cli/drvrglobal.h    |     3 +
 .../unixcli/cli/sqlexportfunc_drvr.cpp          |   470 +-
 .../odbcclient/unixcli/cli/sqlexportfunc_drvr.h |   367 +
 .../odbc/odbcclient/unixcli/cli/sqltocconv.cpp  |    20 +-
 .../odbcclient/unixcli/common/ExpConvMxcs.cpp   |     4 +-
 core/seamonster/src/Makefile                    |     1 -
 core/sqf/Makefile                               |    10 +-
 core/sqf/build-scripts/build.branch             |     2 +-
 core/sqf/build-scripts/genverhdr.ksh            |     2 +-
 core/sqf/commonLogger/CommonLogger.cpp          |    11 +-
 core/sqf/commonLogger/CommonLogger.h            |     8 +-
 core/sqf/conf/log4cxx.monitor.trafns.config     |    45 +
 core/sqf/conf/log4j.dtm.config                  |     5 +
 core/sqf/conf/log4j.sql.config                  |     3 +
 .../export/include/common/evl_sqlog_eventnum.h  |   197 +-
 core/sqf/export/include/seabed/int/thread.inl   |     3 +
 core/sqf/export/include/seabed/ms.h             |     9 +
 core/sqf/export/include/trafconf/trafconfig.h   |   366 +
 .../run_full_trafodion_backup.sh                |     9 +
 .../backuprestore/TrafExportSnapshot.java       |    15 +-
 core/sqf/macros.gmk                             |     9 +
 core/sqf/monitor/linux/cluster.cxx              |  4236 ++++-
 core/sqf/monitor/linux/cluster.h                |   128 +-
 core/sqf/monitor/linux/clusterconf.cxx          |   863 -
 core/sqf/monitor/linux/clusterconf.h            |   118 -
 core/sqf/monitor/linux/cmsh.cxx                 |   146 +-
 core/sqf/monitor/linux/cmsh.h                   |     2 +
 core/sqf/monitor/linux/commaccept.cxx           |   241 +-
 core/sqf/monitor/linux/commaccept.h             |     3 +-
 core/sqf/monitor/linux/config.cxx               |   424 +-
 core/sqf/monitor/linux/config.h                 |    25 +-
 core/sqf/monitor/linux/device.h                 |     2 +
 core/sqf/monitor/linux/getseq.cxx               |     2 -
 core/sqf/monitor/linux/healthcheck.cxx          |   119 +-
 core/sqf/monitor/linux/healthcheck.h            |     5 +
 core/sqf/monitor/linux/internal.h               |   104 +-
 core/sqf/monitor/linux/lnode.cxx                |    47 +-
 core/sqf/monitor/linux/lnode.h                  |     4 +-
 core/sqf/monitor/linux/lnodeconfig.cxx          |   399 -
 core/sqf/monitor/linux/lnodeconfig.h            |   119 -
 core/sqf/monitor/linux/localio.h                |     7 +-
 core/sqf/monitor/linux/macros.gmk               |    14 +-
 core/sqf/monitor/linux/makefile                 |   192 +-
 core/sqf/monitor/linux/meas.cxx                 |   240 +
 core/sqf/monitor/linux/meas.h                   |    75 +
 core/sqf/monitor/linux/mlio.cxx                 |    35 +-
 core/sqf/monitor/linux/mlio.h                   |     2 +
 core/sqf/monitor/linux/monitor.cxx              |  1219 +-
 core/sqf/monitor/linux/monitor.h                |    18 +-
 core/sqf/monitor/linux/monlogging.cxx           |     3 +-
 core/sqf/monitor/linux/monlogging.h             |     2 +
 core/sqf/monitor/linux/monmemlog.cxx            |    11 +
 core/sqf/monitor/linux/monsonar.h               |    18 +
 core/sqf/monitor/linux/montest_run.virtual      |    10 +-
 core/sqf/monitor/linux/montrace.cxx             |    24 +-
 core/sqf/monitor/linux/montrace.h               |    44 +-
 core/sqf/monitor/linux/msgdef.h                 |   202 +-
 core/sqf/monitor/linux/nameserver.cxx           |  1120 ++
 core/sqf/monitor/linux/nameserver.h             |    74 +
 core/sqf/monitor/linux/notice.cxx               |   199 +-
 core/sqf/monitor/linux/notice.h                 |     7 +
 core/sqf/monitor/linux/nscluster.cxx            |    40 +
 core/sqf/monitor/linux/nscommaccept.cxx         |    28 +
 core/sqf/monitor/linux/nscommacceptmon.cxx      |   907 ++
 core/sqf/monitor/linux/nscommacceptmon.h        |    79 +
 core/sqf/monitor/linux/nsconfig.cxx             |    28 +
 core/sqf/monitor/linux/nshealthcheck.cxx        |    28 +
 core/sqf/monitor/linux/nslnode.cxx              |    28 +
 core/sqf/monitor/linux/nsmonitor.cxx            |    28 +
 core/sqf/monitor/linux/nsmontrace.cxx           |    28 +
 core/sqf/monitor/linux/nspnode.cxx              |    28 +
 core/sqf/monitor/linux/nsprocess.cxx            |   132 +
 core/sqf/monitor/linux/nsredirector.cxx         |    28 +
 core/sqf/monitor/linux/nsreplicate.cxx          |    28 +
 core/sqf/monitor/linux/nsreqdelproc.cxx         |   191 +
 core/sqf/monitor/linux/nsreqnewproc.cxx         |   180 +
 core/sqf/monitor/linux/nsreqprocinfo.cxx        |    28 +
 core/sqf/monitor/linux/nsreqprocinfons.cxx      |   288 +
 core/sqf/monitor/linux/nsreqqueue.cxx           |   129 +
 core/sqf/monitor/linux/nsreqshutdown.cxx        |   110 +
 core/sqf/monitor/linux/nsreqstart.cxx           |   130 +
 core/sqf/monitor/linux/nsreqstop.cxx            |   124 +
 core/sqf/monitor/linux/nsreqworker.cxx          |    28 +
 core/sqf/monitor/linux/nstype.h                 |    28 +
 core/sqf/monitor/linux/persistconfig.cxx        |   636 -
 core/sqf/monitor/linux/persistconfig.h          |   165 -
 core/sqf/monitor/linux/pnode.cxx                |   815 +-
 core/sqf/monitor/linux/pnode.h                  |    66 +-
 core/sqf/monitor/linux/pnodeconfig.cxx          |   608 -
 core/sqf/monitor/linux/pnodeconfig.h            |   128 -
 core/sqf/monitor/linux/process.cxx              |  1717 +-
 core/sqf/monitor/linux/process.h                |   109 +-
 core/sqf/monitor/linux/pstartd.cxx              |     1 +
 core/sqf/monitor/linux/pstartd.h                |     2 +-
 core/sqf/monitor/linux/ptpclient.cxx            |  1102 ++
 core/sqf/monitor/linux/ptpclient.h              |    98 +
 core/sqf/monitor/linux/ptpcommaccept.cxx        |   444 +
 core/sqf/monitor/linux/ptpcommaccept.h          |    62 +
 core/sqf/monitor/linux/redirector.cxx           |   133 +-
 core/sqf/monitor/linux/redirector.h             |     4 +-
 core/sqf/monitor/linux/replicate.cxx            |   442 +-
 core/sqf/monitor/linux/replicate.h              |    75 +
 core/sqf/monitor/linux/reqdump.cxx              |    96 +-
 core/sqf/monitor/linux/reqevent.cxx             |   121 +-
 core/sqf/monitor/linux/reqexit.cxx              |     7 +-
 core/sqf/monitor/linux/reqget.cxx               |     2 +-
 core/sqf/monitor/linux/reqkill.cxx              |   152 +-
 core/sqf/monitor/linux/reqnewproc.cxx           |   101 +-
 core/sqf/monitor/linux/reqnodeadd.cxx           |     5 +-
 core/sqf/monitor/linux/reqnodedelete.cxx        |     2 +-
 core/sqf/monitor/linux/reqnodename.cxx          |     2 +-
 core/sqf/monitor/linux/reqnotify.cxx            |   155 +-
 core/sqf/monitor/linux/reqnsadd.cxx             |   197 +
 core/sqf/monitor/linux/reqnsdelete.cxx          |   174 +
 core/sqf/monitor/linux/reqnsstart.cxx           |    71 +
 core/sqf/monitor/linux/reqnsstop.cxx            |    71 +
 core/sqf/monitor/linux/reqopen.cxx              |    72 +-
 core/sqf/monitor/linux/reqprocinfo.cxx          |   612 +-
 core/sqf/monitor/linux/reqqueue.cxx             |  2319 ++-
 core/sqf/monitor/linux/reqqueue.h               |   590 +-
 core/sqf/monitor/linux/reqtmleader.cxx          |    55 +
 core/sqf/monitor/linux/reqworker.cxx            |     6 +-
 core/sqf/monitor/linux/shell.cxx                |  1789 +-
 core/sqf/monitor/linux/system.cxx               |     2 +-
 core/sqf/monitor/linux/tcdb.cxx                 |   478 -
 core/sqf/monitor/linux/tcdb.h                   |   117 -
 core/sqf/monitor/linux/tcdbsqlite.cxx           |  3398 ----
 core/sqf/monitor/linux/tcdbsqlite.h             |   130 -
 core/sqf/monitor/linux/tcdbstore.cxx            |    55 -
 core/sqf/monitor/linux/tcdbstore.h              |   113 -
 core/sqf/monitor/linux/tcdbzstore.cxx           |  2192 ---
 core/sqf/monitor/linux/tcdbzstore.h             |   130 -
 core/sqf/monitor/linux/tclog.cxx                |   121 -
 core/sqf/monitor/linux/tclog.h                  |    46 -
 core/sqf/monitor/linux/tctrace.cxx              |   366 -
 core/sqf/monitor/linux/tctrace.h                |   103 -
 core/sqf/monitor/linux/tmsync.cxx               |    97 +-
 core/sqf/monitor/linux/tmsync.h                 |     2 +-
 core/sqf/monitor/linux/trafconf.cxx             |   631 -
 core/sqf/monitor/linux/trafconfig.cxx           |   560 -
 core/sqf/monitor/linux/trafconfig.h             |   305 -
 core/sqf/monitor/linux/versns.cxx               |    30 +
 core/sqf/monitor/linux/zclient.cxx              |   479 +-
 core/sqf/monitor/linux/zclient.h                |    11 +
 core/sqf/monitor/linux/zootest.cxx              |    10 +-
 core/sqf/monitor/test/Makefile                  |     6 +-
 core/sqf/monitor/test/childExitChild.cxx        |     1 +
 core/sqf/monitor/test/childExitParent.cxx       |     1 +
 core/sqf/monitor/test/monitor.env               |    61 +
 core/sqf/monitor/test/montestutil.cxx           |     4 +-
 core/sqf/monitor/test/nameserver.env            |    61 +
 core/sqf/monitor/test/runtest                   |   261 +-
 core/sqf/monitor/test/sqconfig.monitor.cluster  |    39 -
 core/sqf/monitor/test/sqconfig.monitor.virtual  |     3 +
 core/sqf/sqenvcom.sh                            |    75 +-
 core/sqf/sql/scripts/analyzeMessageGuide.py     |    17 +-
 core/sqf/sql/scripts/analyzeULOG.py             |    62 +-
 core/sqf/sql/scripts/beheadMergeConflict.py     |   112 +
 core/sqf/sql/scripts/cleanat                    |     2 +-
 core/sqf/sql/scripts/createConfigDb             |     7 +
 core/sqf/sql/scripts/dcscheck                   |    24 +-
 core/sqf/sql/scripts/dcsstart                   |     8 +-
 core/sqf/sql/scripts/dcsstop                    |     9 +-
 core/sqf/sql/scripts/genms                      |     8 +
 core/sqf/sql/scripts/gensq.pl                   |    53 +
 core/sqf/sql/scripts/gomon.cold                 |   106 +-
 core/sqf/sql/scripts/ilh_regrinit               |    27 +
 core/sqf/sql/scripts/ilh_trafinit               |     6 +-
 core/sqf/sql/scripts/install_local_hadoop       |    34 +-
 core/sqf/sql/scripts/install_traf_components    |     7 +-
 core/sqf/sql/scripts/monitor.env                |    61 +
 core/sqf/sql/scripts/nameserver.env             |    61 +
 core/sqf/sql/scripts/pkillall                   |    14 +-
 core/sqf/sql/scripts/presumeall                 |     4 +-
 core/sqf/sql/scripts/pstat                      |     2 +-
 core/sqf/sql/scripts/psuspendall                |     4 +-
 core/sqf/sql/scripts/regrinit.sql               |    43 +
 core/sqf/sql/scripts/sqcheck                    |     6 +-
 core/sqf/sql/scripts/sqconfig                   |     4 +
 core/sqf/sql/scripts/sqconfig.persist           |    12 +-
 core/sqf/sql/scripts/sqconfig.sample            |    24 +-
 core/sqf/sql/scripts/sqconfigdb.pm              |    47 +
 core/sqf/sql/scripts/sqgen                      |   236 +-
 core/sqf/sql/scripts/sqnameserver.pm            |   151 +
 core/sqf/sql/scripts/sqnodes.pm                 |     4 +-
 core/sqf/sql/scripts/sqnodestatus               |    23 +-
 core/sqf/sql/scripts/sqpersist.pm               |     4 +-
 core/sqf/sql/scripts/sqstart                    |   211 +-
 core/sqf/sql/scripts/sqstop                     |    36 +-
 core/sqf/sql/scripts/testMdam.py                |   412 +
 core/sqf/sql/scripts/traf_authentication_setup  |     4 +-
 core/sqf/sql/scripts/traf_pkill                 |     2 +-
 core/sqf/src/Makefile                           |     4 +
 core/sqf/src/seabed/src/Makefile                |    20 +-
 core/sqf/src/seabed/src/fsi.cpp                 |     8 +-
 core/sqf/src/seabed/src/labelmaps.cpp           |    29 +
 core/sqf/src/seabed/src/msmon.cpp               |     9 +-
 core/sqf/src/seabed/src/sqstatepi.cpp           |    25 +-
 core/sqf/src/seabed/test/Makefile               |    18 +-
 core/sqf/src/seabed/test/TEST-README.txt        |     1 +
 core/sqf/src/seabed/test/go141                  |     3 +
 core/sqf/src/seabed/test/go17                   |     2 +-
 core/sqf/src/seabed/test/go190                  |     3 +
 core/sqf/src/seabed/test/go20                   |     2 +-
 core/sqf/src/seabed/test/go22                   |     4 +-
 core/sqf/src/seabed/test/go23                   |     2 +-
 core/sqf/src/seabed/test/go286                  |    38 +
 core/sqf/src/seabed/test/go69mon                |     2 +
 core/sqf/src/seabed/test/go83                   |     2 +-
 core/sqf/src/seabed/test/goall                  |    26 +-
 core/sqf/src/seabed/test/gocleanport            |     2 +-
 core/sqf/src/seabed/test/godb.pl                |    15 +
 core/sqf/src/seabed/test/gohost                 |     2 +-
 core/sqf/src/seabed/test/gosetup                |     8 +-
 core/sqf/src/seabed/test/gosetupcl3             |     5 +-
 core/sqf/src/seabed/test/goshell                |     4 +-
 core/sqf/src/seabed/test/goshell124             |     4 +
 core/sqf/src/seabed/test/goshell176             |     4 +
 core/sqf/src/seabed/test/goshell31              |     6 +-
 core/sqf/src/seabed/test/goshell31d             |     6 +-
 core/sqf/src/seabed/test/goshell31vc            |     6 +-
 core/sqf/src/seabed/test/goshell49              |     6 +-
 core/sqf/src/seabed/test/goshell76              |     2 +-
 core/sqf/src/seabed/test/goshell93              |     2 +-
 core/sqf/src/seabed/test/goshell96              |     2 +-
 core/sqf/src/seabed/test/goshelln               |     4 +
 core/sqf/src/seabed/test/t169srv.cpp            |    11 +-
 core/sqf/src/seabed/test/t209ms.cpp             |     4 +
 core/sqf/src/seabed/test/t213fs.cpp             |    11 +-
 core/sqf/src/seabed/test/t226fs.cpp             |     4 +
 core/sqf/src/seabed/test/t228ms.cpp             |    23 +-
 core/sqf/src/seabed/test/t279ms.cpp             |    12 +-
 core/sqf/src/seabed/test/t280fs.cpp             |     2 +
 core/sqf/src/seabed/test/t286ms.cpp             |   396 +
 core/sqf/src/seabed/test/tdelta.cpp             |   269 +
 core/sqf/src/seabed/test/tmerge.cpp             |   322 +
 core/sqf/src/seatrans/.gitignore                |     1 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54   |     1 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55   |     1 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh57   |     1 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.hdp     |     1 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.hdp2_1  |     1 +
 core/sqf/src/seatrans/hbase-trx/pom.xml.mapr    |   334 -
 .../transactional/TransactionManager.java       |   110 +-
 .../transactional/TrxRegionEndpoint.java.tmpl   |   320 +
 .../generated/SsccRegionProtos.java             |     1 +
 .../generated/TrxRegionProtos.java              |  3225 +++-
 .../hbase-trx/src/main/protobuf/TrxRegion.proto |    32 +
 .../sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp |     8 +-
 core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h  |     6 +-
 .../tm/hbasetmlib2/javaobjectinterfacetm.cpp    |     3 +-
 .../tm/hbasetmlib2/javaobjectinterfacetm.h      |     1 +
 .../sqf/src/seatrans/tm/hbasetmlib2/testrun.cpp |     2 +-
 core/sqf/src/stfs/common/stfs_msgbuff.cpp       |    48 +-
 core/sqf/src/tm/tm.cpp                          |     6 +-
 core/sqf/src/tm/tm_internal.h                   |     1 -
 core/sqf/src/tm/tmlib.cpp                       |   188 +-
 core/sqf/src/tm/tmlib.h                         |    27 +-
 core/sqf/src/tm/tmlibmsg.h                      |     4 +-
 core/sqf/src/tm/tmtransaction.cpp               |    22 +-
 core/sqf/src/tm/tools/dtmci.cpp                 |     2 -
 core/sqf/src/tm/tools/pwd.cpp                   |     2 -
 core/sqf/src/tm/tools/tmshutdown.cpp            |     1 -
 core/sqf/src/trafconf/Makefile                  |   123 +
 core/sqf/src/trafconf/clusterconf.cpp           |   912 ++
 core/sqf/src/trafconf/clusterconf.h             |   122 +
 core/sqf/src/trafconf/lnodeconfig.cpp           |   397 +
 core/sqf/src/trafconf/lnodeconfig.h             |   121 +
 core/sqf/src/trafconf/macros.gmk                |   112 +
 core/sqf/src/trafconf/nameserverconfig.cpp      |   350 +
 core/sqf/src/trafconf/nameserverconfig.h        |    79 +
 core/sqf/src/trafconf/persistconfig.cpp         |   640 +
 core/sqf/src/trafconf/persistconfig.h           |   164 +
 core/sqf/src/trafconf/pnodeconfig.cpp           |   629 +
 core/sqf/src/trafconf/pnodeconfig.h             |   131 +
 core/sqf/src/trafconf/tcdb.cpp                  |   518 +
 core/sqf/src/trafconf/tcdb.h                    |   122 +
 core/sqf/src/trafconf/tcdbsqlite.cpp            |  3728 +++++
 core/sqf/src/trafconf/tcdbsqlite.h              |   134 +
 core/sqf/src/trafconf/tcdbstore.cpp             |    56 +
 core/sqf/src/trafconf/tcdbstore.h               |   116 +
 core/sqf/src/trafconf/tclog.cpp                 |   121 +
 core/sqf/src/trafconf/tclog.h                   |    46 +
 core/sqf/src/trafconf/tctrace.cpp               |   368 +
 core/sqf/src/trafconf/tctrace.h                 |   107 +
 core/sqf/src/trafconf/trafconf.cpp              |   819 +
 core/sqf/src/trafconf/trafconfig.cpp            |   655 +
 core/sql/SqlCompilerDebugger/QueryData.cpp      |     4 -
 core/sql/arkcmp/ApplicationFile.cpp             |     2 -
 core/sql/arkcmp/CmpCommon.cpp                   |     2 +-
 core/sql/arkcmp/CmpConnection.cpp               |    30 +-
 core/sql/arkcmp/CmpContext.cpp                  |   115 +-
 core/sql/arkcmp/CmpContext.h                    |    23 +-
 core/sql/arkcmp/CmpISPUtils.cpp                 |     2 -
 core/sql/arkcmp/CmpSqlSession.cpp               |     6 +-
 core/sql/arkcmp/CmpStatement.cpp                |   222 +-
 core/sql/arkcmp/CmpStatement.h                  |    31 +-
 core/sql/arkcmp/CmpStoredProc.cpp               |     9 -
 core/sql/arkcmp/CmpStoredProc.h                 |     3 -
 core/sql/arkcmp/CompException.h                 |     8 +-
 core/sql/arkcmp/ExtQualModuleNames.cpp          |     1 -
 core/sql/arkcmp/ExtQualModuleNames.h            |     4 -
 core/sql/arkcmp/ProcessEnv.cpp                  |     8 +-
 core/sql/arkcmp/ProcessEnv.h                    |     5 -
 core/sql/arkcmp/SPUtil.cpp                      |     8 -
 core/sql/arkcmp/SQLJFile.cpp                    |     2 -
 core/sql/arkcmp/VersioningStoredProc.cpp        |     2 -
 core/sql/arkcmp/cmpargs.cpp                     |     4 +-
 core/sql/arkcmp/vers_libarkcmp.cpp              |     2 -
 core/sql/bin/SqlEsp_templ.cpp                   |    85 -
 core/sql/bin/SqlciErrors.txt                    |   510 +-
 core/sql/bin/SqlciMain.cpp                      |    22 +-
 core/sql/bin/Sqlci_templ.cpp                    |   132 -
 core/sql/bin/arkcmp.cpp                         |    17 +-
 core/sql/bin/ex_esp_main.cpp                    |    28 +-
 core/sql/bin/ex_sscp_main.cpp                   |     6 +-
 core/sql/bin/ex_ssmp_main.cpp                   |    16 +-
 core/sql/bin/vproceid.cpp                       |     2 +-
 core/sql/cli/Cli.cpp                            |  1692 +-
 core/sql/cli/Cli.h                              |    34 +-
 core/sql/cli/CliDefs.h                          |     3 -
 core/sql/cli/CliDll.cpp                         |    80 -
 core/sql/cli/CliExpExchange.cpp                 |    77 +-
 core/sql/cli/CliExtern.cpp                      |  1482 +-
 core/sql/cli/CliImplLmExtFunc.cpp               |     2 -
 core/sql/cli/CliSemaphore.h                     |     1 +
 core/sql/cli/CliStubsStaticBuild.cpp            |    64 -
 core/sql/cli/Context.cpp                        |  1605 +-
 core/sql/cli/Context.h                          |    87 +-
 core/sql/cli/Descriptor.cpp                     |    60 +-
 core/sql/cli/Descriptor.h                       |    12 +-
 core/sql/cli/ExSqlComp.cpp                      |   319 +-
 core/sql/cli/ExSqlComp.h                        |     1 -
 core/sql/cli/Globals.cpp                        |   249 +-
 core/sql/cli/Globals.h                          |   144 +-
 core/sql/cli/GlobalsDef.cpp                     |     2 +-
 core/sql/cli/Module.cpp                         |    49 +-
 core/sql/cli/Module.h                           |     5 -
 core/sql/cli/NoWaitOp.cpp                       |   275 -
 core/sql/cli/NoWaitOp.h                         |    89 -
 core/sql/cli/QuasiFileManager.cpp               |   587 -
 core/sql/cli/QuasiFileManager.h                 |   159 -
 core/sql/cli/SQLCLIdev.h                        |   675 +-
 core/sql/cli/SessionDefaults.cpp                |    18 +-
 core/sql/cli/SessionDefaults.h                  |    12 +
 core/sql/cli/Statement.cpp                      |   419 +-
 core/sql/cli/Statement.h                        |    38 +-
 core/sql/cli/StoredProcInterface.cpp            |    11 -
 core/sql/cli/StoredProcInterface.h              |     9 -
 core/sql/cli/VicKeyValuePair.h                  |    36 -
 core/sql/cli/cli_stdh.h                         |     3 +-
 core/sql/cli/globalsrlversion.cpp               |    40 -
 core/sql/cli/globalstubs.cpp                    |    54 -
 core/sql/cli/memorymonitor.cpp                  |     2 -
 core/sql/cli/memorymonitor.h                    |     3 -
 core/sql/cli/muse.cpp                           |     6 -
 core/sql/cli/privsrlversion.cpp                 |    41 -
 core/sql/cli/rtdu.cpp                           |    98 -
 core/sql/cli/rtdu.h                             |   919 --
 core/sql/cli/rtdu2.cpp                          |   291 -
 core/sql/cli/rtdu2.h                            |   142 -
 core/sql/cli/sql_id.cpp                         |    16 -
 core/sql/cli/sql_id.h                           |    18 -
 core/sql/cli/sqlciSRLStubs.cpp                  |    30 -
 core/sql/cli/sqlcli.h                           |   330 +-
 core/sql/cli/test.cpp                           |   120 -
 core/sql/clitest/blobtest.cpp                   |    24 +-
 core/sql/comexe/CmpMessage.cpp                  |    75 +-
 core/sql/comexe/CmpMessage.h                    |    69 +-
 core/sql/comexe/ComCompressionInfo.cpp          |    84 +
 core/sql/comexe/ComCompressionInfo.h            |    91 +
 core/sql/comexe/ComKeyMDAM.h                    |   118 +-
 core/sql/comexe/ComKeyRange.cpp                 |    10 +-
 core/sql/comexe/ComKeyRange.h                   |    38 +-
 core/sql/comexe/ComKeySingleSubset.h            |    30 +-
 core/sql/comexe/ComPackDefs.h                   |     2 -
 core/sql/comexe/ComQueue.cpp                    |     4 -
 core/sql/comexe/ComQueue.h                      |    62 +-
 core/sql/comexe/ComResourceInfo.cpp             |     4 -
 core/sql/comexe/ComTdb.cpp                      |   192 +-
 core/sql/comexe/ComTdb.h                        |   257 +-
 core/sql/comexe/ComTdbAll.h                     |     8 -
 core/sql/comexe/ComTdbBlockingHdfsScan.cpp      |    10 -
 core/sql/comexe/ComTdbBlockingHdfsScan.h        |     9 -
 core/sql/comexe/ComTdbCompoundStmt.cpp          |     2 -
 core/sql/comexe/ComTdbCompoundStmt.h            |    22 -
 core/sql/comexe/ComTdbControl.cpp               |     2 -
 core/sql/comexe/ComTdbControl.h                 |    16 +-
 core/sql/comexe/ComTdbDDL.h                     |    16 +-
 core/sql/comexe/ComTdbDp2Oper.h                 |     8 -
 core/sql/comexe/ComTdbExeUtil.cpp               |   200 +-
 core/sql/comexe/ComTdbExeUtil.h                 |   301 +-
 core/sql/comexe/ComTdbExplain.cpp               |     2 -
 core/sql/comexe/ComTdbExplain.h                 |    14 +-
 core/sql/comexe/ComTdbFastTransport.cpp         |     5 +-
 core/sql/comexe/ComTdbFastTransport.h           |    42 +-
 core/sql/comexe/ComTdbFirstN.cpp                |     2 +-
 core/sql/comexe/ComTdbFirstN.h                  |     6 +-
 core/sql/comexe/ComTdbHashGrby.h                |    68 +-
 core/sql/comexe/ComTdbHashj.cpp                 |     8 +-
 core/sql/comexe/ComTdbHashj.h                   |    20 +-
 core/sql/comexe/ComTdbHbaseAccess.cpp           |    10 +-
 core/sql/comexe/ComTdbHbaseAccess.h             |    14 +-
 core/sql/comexe/ComTdbHdfsScan.cpp              |    23 +-
 core/sql/comexe/ComTdbHdfsScan.h                |    27 +-
 core/sql/comexe/ComTdbMj.cpp                    |     6 +-
 core/sql/comexe/ComTdbMj.h                      |     2 +-
 core/sql/comexe/ComTdbOnlj.cpp                  |     2 +-
 core/sql/comexe/ComTdbOnlj.h                    |     2 +-
 core/sql/comexe/ComTdbPackRows.h                |    13 -
 core/sql/comexe/ComTdbProbeCache.cpp            |     2 +-
 core/sql/comexe/ComTdbRoot.cpp                  |    22 +-
 core/sql/comexe/ComTdbRoot.h                    |    12 +-
 core/sql/comexe/ComTdbSample.h                  |    18 -
 core/sql/comexe/ComTdbSendBottom.cpp            |     8 +-
 core/sql/comexe/ComTdbSendBottom.h              |     2 -
 core/sql/comexe/ComTdbSendTop.cpp               |    14 +-
 core/sql/comexe/ComTdbSendTop.h                 |     2 +-
 core/sql/comexe/ComTdbSequence.cpp              |     6 +-
 core/sql/comexe/ComTdbSequence.h                |    20 +-
 core/sql/comexe/ComTdbSort.cpp                  |    21 +-
 core/sql/comexe/ComTdbSort.h                    |    52 +-
 core/sql/comexe/ComTdbSortGrby.cpp              |     4 +-
 core/sql/comexe/ComTdbSortGrby.h                |    18 -
 core/sql/comexe/ComTdbSplitBottom.cpp           |    12 +-
 core/sql/comexe/ComTdbSplitBottom.h             |     2 -
 core/sql/comexe/ComTdbSplitTop.cpp              |     8 +-
 core/sql/comexe/ComTdbSplitTop.h                |     6 +-
 core/sql/comexe/ComTdbStats.cpp                 |    16 +-
 core/sql/comexe/ComTdbStats.h                   |     7 +-
 core/sql/comexe/ComTdbStoredProc.cpp            |     2 +-
 core/sql/comexe/ComTdbTranspose.h               |    22 +-
 core/sql/comexe/ComTdbTuple.cpp                 |     2 -
 core/sql/comexe/ComTdbTuple.h                   |    36 +-
 core/sql/comexe/ComTdbTupleFlow.cpp             |    40 +-
 core/sql/comexe/ComTdbTupleFlow.h               |     2 +-
 core/sql/comexe/ComTdbUdr.cpp                   |     8 +-
 core/sql/comexe/ComTdbUdr.h                     |     2 +-
 core/sql/comexe/ComTdbUnPackRows.cpp            |     6 +-
 core/sql/comexe/ComTdbUnPackRows.h              |    26 +-
 core/sql/comexe/ComTdbUnion.cpp                 |     8 +-
 core/sql/comexe/ComTdbUnion.h                   |    10 +-
 core/sql/comexe/ExplainTuple.cpp                |     8 +-
 core/sql/comexe/FragDir.cpp                     |     2 +-
 core/sql/comexe/FragmentDir.cpp                 |     2 +-
 core/sql/comexe/HashBufferHeader.h              |     8 -
 core/sql/comexe/HashRow.h                       |    14 -
 core/sql/comexe/LateBindInfo.cpp                |   261 +-
 core/sql/comexe/LateBindInfo.h                  |    57 +-
 core/sql/comexe/PartInputDataDesc.cpp           |    56 +-
 core/sql/comexe/QueueIndex.h                    |     5 -
 core/sql/comexe/SqlTableOpenInfo.h              |    17 -
 core/sql/common/BaseTypes.cpp                   |    16 +-
 core/sql/common/BaseTypes.h                     |    19 +-
 core/sql/common/BigNumHelper.cpp                |    14 -
 core/sql/common/BigNumHelper.h                  |    19 -
 core/sql/common/BloomFilter.cpp                 |     2 +-
 core/sql/common/CharType.cpp                    |   124 +-
 core/sql/common/CharType.h                      |    65 +-
 core/sql/common/CmpCommon.h                     |    17 +-
 core/sql/common/Collections.cpp                 |    31 +-
 core/sql/common/Collections.h                   |   106 +-
 core/sql/common/ComASSERT.h                     |     4 +-
 core/sql/common/ComAnsiNamePart.cpp             |    24 +
 core/sql/common/ComAnsiNamePart.h               |     9 +-
 core/sql/common/ComCextMisc.cpp                 |    10 -
 core/sql/common/ComDistribution.cpp             |     1 +
 core/sql/common/ComDistribution.h               |    16 +-
 core/sql/common/ComMPLoc.h                      |     8 +-
 core/sql/common/ComMisc.cpp                     |    47 +
 core/sql/common/ComMisc.h                       |    14 +
 core/sql/common/ComMvAttributeBitmap.cpp        |    10 -
 core/sql/common/ComMvAttributeBitmap.h          |     2 -
 core/sql/common/ComObjectName.cpp               |    41 +-
 core/sql/common/ComObjectName.h                 |     4 -
 core/sql/common/ComResWords.cpp                 |   194 +-
 core/sql/common/ComResWords.h                   |    25 +-
 core/sql/common/ComRoutineActionNamePart.h      |     6 -
 core/sql/common/ComRtUtils.cpp                  |    47 +-
 core/sql/common/ComRtUtils.h                    |    11 +-
 core/sql/common/ComSafePrinter.cpp              |     2 +-
 core/sql/common/ComSchemaName.cpp               |    25 -
 core/sql/common/ComSecurityKey.cpp              |   114 +-
 core/sql/common/ComSecurityKey.h                |     5 +-
 core/sql/common/ComSmallDefs.cpp                |    13 +-
 core/sql/common/ComSmallDefs.h                  |    59 +-
 core/sql/common/ComSpace.cpp                    |    92 +-
 core/sql/common/ComSpace.h                      |    59 +-
 core/sql/common/ComSqlId.cpp                    |     4 +-
 core/sql/common/ComSqlId.h                      |    19 +-
 core/sql/common/ComSysUtils.cpp                 |     1 -
 core/sql/common/ComSysUtils.h                   |    17 +-
 core/sql/common/ComTransInfo.cpp                |    24 +-
 core/sql/common/ComTransInfo.h                  |   214 +-
 core/sql/common/ComUser.cpp                     |     9 +-
 core/sql/common/ComVersionDefs.h                |     2 +-
 core/sql/common/ComViewColUsage.h               |     2 +-
 core/sql/common/DTICommonType.cpp               |    28 +
 core/sql/common/DTICommonType.h                 |    12 +-
 core/sql/common/DateTimeType.cpp                |   124 +-
 core/sql/common/DatetimeType.h                  |    70 +-
 core/sql/common/DgBaseType.cpp                  |     2 +-
 core/sql/common/DgBaseType.h                    |   169 +-
 core/sql/common/DllExportDefines.h              |    21 -
 core/sql/common/ExprNode.cpp                    |    23 +-
 core/sql/common/Int64.h                         |    28 +-
 core/sql/common/IntervalType.cpp                |    38 +-
 core/sql/common/IntervalType.h                  |    41 +-
 core/sql/common/Ipc.cpp                         |   137 +-
 core/sql/common/Ipc.h                           |    93 +-
 core/sql/common/IpcGuardian.cpp                 |   321 +-
 core/sql/common/IpcMessageType.h                |    44 -
 core/sql/common/IpcSockets.cpp                  |    22 -
 core/sql/common/MiscType.cpp                    |    47 +-
 core/sql/common/MiscType.h                      |    24 +-
 core/sql/common/NAAssert.cpp                    |     2 -
 core/sql/common/NAAssert.h                      |    17 +-
 core/sql/common/NAError.cpp                     |     2 -
 core/sql/common/NAError.h                       |    58 +-
 core/sql/common/NAHeap.h                        |    16 +-
 core/sql/common/NAIpc.cpp                       |     2 -
 core/sql/common/NAIpc.h                         |     2 +-
 core/sql/common/NAMemory.cpp                    |   675 +-
 core/sql/common/NAMemory.h                      |   562 +-
 core/sql/common/NAStdlib.h                      |     9 -
 core/sql/common/NAString.cpp                    |    54 +-
 core/sql/common/NAString2.cpp                   |    22 +-
 core/sql/common/NAStringDefGlobals.h            |     6 +-
 core/sql/common/NATestpoint.cpp                 |     2 -
 core/sql/common/NAType.cpp                      |    80 +-
 core/sql/common/NAType.h                        |    12 +-
 core/sql/common/NAUserId.h                      |    73 +-
 core/sql/common/NAWinNT.h                       |    59 +-
 core/sql/common/NLSConversion.h                 |    20 -
 core/sql/common/NumericType.cpp                 |   143 +-
 core/sql/common/NumericType.h                   |   129 +-
 core/sql/common/OperTypeEnum.h                  |    16 +-
 core/sql/common/Platform.h                      |   254 +-
 core/sql/common/QueryText.h                     |     4 -
 core/sql/common/SMConnection.cpp                |    13 -
 core/sql/common/SequenceGeneratorAttributes.h   |     2 -
 core/sql/common/SharedPtr.h                     |     8 +-
 core/sql/common/SqlEventsDllDefines.h           |     8 +-
 core/sql/common/SqlExpDllDefines.h              |    50 -
 core/sql/common/SqlExportDllDefines.h           |    44 -
 core/sql/common/SqlLmDllDefines.h               |    20 +-
 core/sql/common/Timer.h                         |     2 -
 core/sql/common/arkcmp_proc.cpp                 |     5 -
 core/sql/common/charinfo.cpp                    |    89 +-
 core/sql/common/charinfo.h                      |     7 +-
 core/sql/common/conversionHex.cpp               |    18 -
 core/sql/common/conversionLocale.cpp            |     3 +-
 core/sql/common/conversionSJIS.cpp              |    11 +-
 core/sql/common/csconvert.cpp                   |     4 +-
 core/sql/common/csconvert.h                     |    15 -
 core/sql/common/dfs2rec.h                       |    53 +-
 core/sql/common/from_GB18030.c                  |     8 -
 core/sql/common/from_GBK.c                      |     3 -
 core/sql/common/from_SJIS.c                     |     2 -
 core/sql/common/from_ksc5601.c                  |     2 -
 core/sql/common/iconv_gen.c                     |    15 -
 core/sql/common/ipcmsg.cpp                      |    45 -
 core/sql/common/ipcmsg.h                        |     2 +-
 core/sql/common/mb_lconv.c                      |    38 +-
 core/sql/common/memtest.cpp                     |     1 -
 core/sql/common/multi-byte.h                    |     5 -
 core/sql/common/nawstring.cpp                   |    12 -
 core/sql/common/nawstring.h                     |    18 +-
 core/sql/common/nchar_mp.h                      |    37 +-
 core/sql/common/purify.h                        |    36 -
 core/sql/common/str.cpp                         |   357 +-
 core/sql/common/str.h                           |    47 +-
 core/sql/common/stringBuf.h                     |    31 +-
 core/sql/common/swscanf.cpp                     |    35 +-
 core/sql/common/swsprintf.cpp                   |    34 -
 core/sql/common/unicode_char_set.cpp            |    14 -
 core/sql/common/unicode_char_set.h              |    18 -
 core/sql/common/wc_scanf_sprintf.h              |    20 +-
 core/sql/common/wstr.cpp                        |    47 +-
 core/sql/common/wstr.h                          |     5 +-
 core/sql/eh/EHJmpBufStack.cpp                   |     2 +-
 core/sql/executor/Allocator.h                   |     4 -
 core/sql/executor/BufferList.cpp                |    18 +-
 core/sql/executor/BufferReference.cpp           |     4 +-
 core/sql/executor/CliMsgObj.cpp                 |     2 -
 core/sql/executor/ExAll.cpp                     |     1 -
 core/sql/executor/ExBitMapTable.cpp             |    10 -
 core/sql/executor/ExBitMapTable.h               |    19 -
 core/sql/executor/ExCancel.cpp                  |    23 +-
 core/sql/executor/ExCancel.h                    |     6 +-
 core/sql/executor/ExComTdb.cpp                  |   185 +-
 core/sql/executor/ExCompoundStmt.h              |    38 +-
 core/sql/executor/ExDupSqlBuffer.cpp            |    13 -
 core/sql/executor/ExExeUtil.h                   |   524 +-
 core/sql/executor/ExExeUtilCli.cpp              |   180 +-
 core/sql/executor/ExExeUtilCli.h                |    24 +-
 core/sql/executor/ExExeUtilCommon.cpp           |    77 +-
 core/sql/executor/ExExeUtilExplain.cpp          |    57 +-
 core/sql/executor/ExExeUtilGet.cpp              |  1388 +-
 core/sql/executor/ExExeUtilGetStats.cpp         |   982 +-
 core/sql/executor/ExExeUtilLoad.cpp             |   872 +-
 core/sql/executor/ExExeUtilMisc.cpp             |  1305 +-
 core/sql/executor/ExExeUtilVolTab.cpp           |    29 +-
 core/sql/executor/ExExplain.cpp                 |    33 +-
 core/sql/executor/ExExplain.h                   |     6 +-
 core/sql/executor/ExFastTransport.cpp           |   159 +-
 core/sql/executor/ExFastTransport.h             |    18 +-
 core/sql/executor/ExFirstN.cpp                  |    13 +-
 core/sql/executor/ExFirstN.h                    |    34 +-
 core/sql/executor/ExHbaseAccess.cpp             |    66 +-
 core/sql/executor/ExHbaseAccess.h               |    57 +-
 core/sql/executor/ExHbaseIUD.cpp                |    64 +-
 core/sql/executor/ExHdfsScan.cpp                |   491 +-
 core/sql/executor/ExHdfsScan.h                  |   121 +-
 core/sql/executor/ExMeas.cpp                    |   163 -
 core/sql/executor/ExMeas.h                      |   289 -
 core/sql/executor/ExPack.h                      |    35 +-
 core/sql/executor/ExPackedRows.cpp              |     2 -
 core/sql/executor/ExPackedRows.h                |    31 +-
 core/sql/executor/ExProbeCache.h                |     8 +-
 core/sql/executor/ExRLE.h                       |    10 -
 core/sql/executor/ExRsInfo.cpp                  |    24 +-
 core/sql/executor/ExRsInfo.h                    |    21 +-
 core/sql/executor/ExSMCommon.cpp                |     1 +
 core/sql/executor/ExSMCommon.h                  |     3 +-
 core/sql/executor/ExSMEvent.cpp                 |     4 +-
 core/sql/executor/ExSMGlobals.cpp               |     3 +-
 core/sql/executor/ExSMQueue.cpp                 |     2 +-
 core/sql/executor/ExSMReader.cpp                |     1 +
 core/sql/executor/ExSMShortMessage.cpp          |     2 +-
 core/sql/executor/ExSMTaskList.cpp              |     4 +-
 core/sql/executor/ExSample.h                    |    50 +-
 core/sql/executor/ExScheduler.cpp               |    99 +-
 core/sql/executor/ExScheduler.h                 |    26 +-
 core/sql/executor/ExSequence.cpp                |    74 +-
 core/sql/executor/ExSimpleSample.h              |    23 +-
 core/sql/executor/ExSimpleSqlBuffer.cpp         |     3 -
 core/sql/executor/ExSimpleSqlBuffer.h           |    12 -
 core/sql/executor/ExStats.cpp                   |   361 +-
 core/sql/executor/ExStats.h                     |   836 +-
 core/sql/executor/ExTranspose.cpp               |     2 -
 core/sql/executor/ExTranspose.h                 |    33 +-
 core/sql/executor/ExUdr.cpp                     |     7 +-
 core/sql/executor/ExUdr.h                       |     6 +-
 core/sql/executor/ExUdrClientIpc.cpp            |     6 -
 core/sql/executor/ExUdrServer.cpp               |    33 +-
 core/sql/executor/ExVPJoin.cpp                  |    22 -
 core/sql/executor/ExVPJoin.h                    |    35 +-
 core/sql/executor/Ex_esp_msg.h                  |     6 -
 core/sql/executor/FixedSizeHeapElement.h        |    18 +-
 core/sql/executor/FixedSizeHeapManager.h        |    30 +-
 core/sql/executor/HBaseClient_JNI.cpp           |  1196 +-
 core/sql/executor/HBaseClient_JNI.h             |   145 +-
 core/sql/executor/HdfsClient_JNI.cpp            |  1241 ++
 core/sql/executor/HdfsClient_JNI.h              |   251 +
 core/sql/executor/HdfsLogger.h                  |     2 -
 core/sql/executor/HiveClient_JNI.cpp            |   537 +
 core/sql/executor/HiveClient_JNI.h              |   113 +
 core/sql/executor/JavaObjectInterface.cpp       |   203 +-
 core/sql/executor/JavaObjectInterface.h         |    51 +-
 core/sql/executor/MdamEndPoint.h                |    32 +-
 core/sql/executor/MdamInterval.h                |    44 +-
 core/sql/executor/MdamIntervalIterator.h        |     6 +-
 core/sql/executor/MdamIntervalList.h            |    30 +-
 core/sql/executor/MdamIntervalListIterator.h    |     8 +-
 core/sql/executor/MdamIntervalListMerger.h      |    10 +-
 core/sql/executor/MdamPoint.cpp                 |     4 -
 core/sql/executor/MdamPoint.h                   |    29 +-
 core/sql/executor/MdamRefList.cpp               |     4 -
 core/sql/executor/MdamRefList.h                 |    36 +-
 core/sql/executor/MdamRefListEntry.h            |    20 +-
 core/sql/executor/MdamRefListIterator.h         |     6 +-
 core/sql/executor/OrcFileReader.cpp             |   218 +-
 core/sql/executor/OrcFileReader.h               |     6 +-
 core/sql/executor/SequenceFileReader.cpp        |   517 +-
 core/sql/executor/SequenceFileReader.h          |    34 +-
 core/sql/executor/SwapSpace.cpp                 |    12 -
 core/sql/executor/TriggerEnable.h               |     2 -
 core/sql/executor/UdrExeIpc.h                   |     6 +-
 core/sql/executor/cluster.cpp                   |    95 +-
 core/sql/executor/cluster.h                     |   163 +-
 core/sql/executor/dfs2fe.h                      |     4 +-
 core/sql/executor/dmeasql.h                     |    89 -
 core/sql/executor/ex_control.cpp                |   398 +-
 core/sql/executor/ex_control.h                  |     6 +-
 core/sql/executor/ex_ddl.cpp                    |   336 +-
 core/sql/executor/ex_ddl.h                      |    31 +-
 core/sql/executor/ex_error.h                    |     4 -
 core/sql/executor/ex_esp_frag_dir.cpp           |    83 +-
 core/sql/executor/ex_esp_frag_dir.h             |     7 +-
 core/sql/executor/ex_esp_msg.cpp                |    14 -
 core/sql/executor/ex_ex.cpp                     |    76 +-
 core/sql/executor/ex_ex.h                       |    25 +-
 core/sql/executor/ex_exe_stmt_globals.cpp       |    36 +-
 core/sql/executor/ex_exe_stmt_globals.h         |    72 +-
 core/sql/executor/ex_frag_rt.cpp                |   125 +-
 core/sql/executor/ex_frag_rt.h                  |    14 +-
 core/sql/executor/ex_globals.cpp                |    38 +-
 core/sql/executor/ex_globals.h                  |    85 +-
 core/sql/executor/ex_god.h                      |     5 -
 core/sql/executor/ex_hash_grby.cpp              |   105 +-
 core/sql/executor/ex_hash_grby.h                |    43 +-
 core/sql/executor/ex_hashj.cpp                  |    36 +-
 core/sql/executor/ex_hashj.h                    |    10 +-
 core/sql/executor/ex_io_control.h               |    32 +-
 core/sql/executor/ex_key_object.h               |     1 -
 core/sql/executor/ex_mdam.cpp                   |    22 +-
 core/sql/executor/ex_mdam.h                     |    70 +-
 core/sql/executor/ex_mj.cpp                     |    40 +-
 core/sql/executor/ex_mj.h                       |     8 +-
 core/sql/executor/ex_onlj.cpp                   |    29 +-
 core/sql/executor/ex_onlj.h                     |     6 +-
 core/sql/executor/ex_queue.cpp                  |    50 +-
 core/sql/executor/ex_queue.h                    |   122 +-
 core/sql/executor/ex_root.cpp                   |   292 +-
 core/sql/executor/ex_root.h                     |    17 +-
 core/sql/executor/ex_send_bottom.cpp            |    26 +-
 core/sql/executor/ex_send_bottom.h              |     8 +-
 core/sql/executor/ex_send_top.cpp               |     2 -
 core/sql/executor/ex_send_top.h                 |     8 +-
 core/sql/executor/ex_sort.cpp                   |   170 +-
 core/sql/executor/ex_sort.h                     |    10 +-
 core/sql/executor/ex_sort_grby.h                |    13 +-
 core/sql/executor/ex_split_bottom.cpp           |    25 +-
 core/sql/executor/ex_split_bottom.h             |     8 +-
 core/sql/executor/ex_split_top.cpp              |    39 +-
 core/sql/executor/ex_split_top.h                |     8 +-
 core/sql/executor/ex_stdh.h                     |     2 +-
 core/sql/executor/ex_stored_proc.cpp            |    16 -
 core/sql/executor/ex_stored_proc.h              |     6 +-
 core/sql/executor/ex_tcb.h                      |    98 +-
 core/sql/executor/ex_tcb_private.cpp            |     2 -
 core/sql/executor/ex_tcb_private.h              |     7 -
 core/sql/executor/ex_timeout.cpp                |     8 -
 core/sql/executor/ex_timeout.h                  |    10 +-
 core/sql/executor/ex_transaction.cpp            |    41 +-
 core/sql/executor/ex_transaction.h              |    11 +-
 core/sql/executor/ex_tuple.cpp                  |    18 +-
 core/sql/executor/ex_tuple.h                    |    44 +-
 core/sql/executor/ex_tuple_flow.cpp             |    29 +-
 core/sql/executor/ex_tuple_flow.h               |     6 +-
 core/sql/executor/ex_union.cpp                  |    14 -
 core/sql/executor/ex_union.h                    |    59 +-
 core/sql/executor/hash_table.cpp                |    16 +-
 core/sql/executor/hash_table.h                  |    34 -
 core/sql/executor/hiveHook.cpp                  |   103 +-
 core/sql/executor/key_range.cpp                 |     4 -
 core/sql/executor/key_range.h                   |    28 +-
 core/sql/executor/key_single_subset.cpp         |     6 -
 core/sql/executor/key_single_subset.h           |    28 +-
 .../sql/executor/org_trafodion_sql_HDFSClient.h |    31 +
 .../executor/org_trafodion_sql_HTableClient.h   |     4 +-
 core/sql/executor/rcb.h                         |    70 -
 core/sql/executor/sql_buffer.cpp                |   182 +-
 core/sql/executor/sql_buffer.h                  |    27 +-
 core/sql/executor/sql_buffer_size.h             |     3 -
 core/sql/executor/stubs.cpp                     |   422 -
 core/sql/executor/stubs2.cpp                    |   107 -
 core/sql/executor/tempfile.cpp                  |   106 -
 core/sql/executor/tempfile.h                    |   104 -
 core/sql/executor/timeout_data.cpp              |    10 -
 core/sql/executor/timeout_data.h                |     6 +-
 core/sql/exp/ExpAtp.cpp                         |    16 +-
 core/sql/exp/ExpAtp.h                           |    51 +-
 core/sql/exp/ExpBitMuxFunction.cpp              |    10 -
 core/sql/exp/ExpBitMuxFunction.h                |    24 +-
 core/sql/exp/ExpConvMxcs.cpp                    |    12 +-
 core/sql/exp/ExpCriDesc.cpp                     |    10 +-
 core/sql/exp/ExpCriDesc.h                       |    24 +-
 core/sql/exp/ExpDll.cpp                         |     6 +-
 core/sql/exp/ExpError.cpp                       |    50 +-
 core/sql/exp/ExpError.h                         |    28 +-
 core/sql/exp/ExpErrorEnums.h                    |    27 +-
 core/sql/exp/ExpHbaseDefs.h                     |     1 +
 core/sql/exp/ExpHbaseInterface.cpp              |   123 +-
 core/sql/exp/ExpHbaseInterface.h                |    28 +-
 core/sql/exp/ExpLOB.cpp                         |   359 +-
 core/sql/exp/ExpLOB.h                           |   265 +-
 core/sql/exp/ExpLOBaccess.cpp                   |   756 +-
 core/sql/exp/ExpLOBaccess.h                     |    28 +-
 core/sql/exp/ExpLOBenums.h                      |     6 +-
 core/sql/exp/ExpLOBexternal.h                   |     9 +-
 core/sql/exp/ExpLOBinterface.cpp                |   185 +-
 core/sql/exp/ExpLOBinterface.h                  |    84 +-
 core/sql/exp/ExpLOBprocess.cpp                  |    10 +-
 core/sql/exp/ExpPCode.cpp                       |    81 +-
 core/sql/exp/ExpPCode.h                         |    29 +-
 core/sql/exp/ExpPCodeClauseGen.cpp              |   203 +-
 core/sql/exp/ExpPCodeExpGen.cpp                 |    41 +-
 core/sql/exp/ExpPCodeInstruction.h              |   139 +-
 core/sql/exp/ExpPCodeList.h                     |    31 +-
 core/sql/exp/ExpPCodeOptimizations.cpp          |   195 +-
 core/sql/exp/ExpPCodeOptimizations.h            |    28 +-
 core/sql/exp/ExpPCodeOptsNativeExpr.cpp         |    11 +-
 core/sql/exp/ExpPCodeOptsPeeling.cpp            |    15 +-
 core/sql/exp/ExpPCodeOptsRuntime.cpp            |    16 +-
 core/sql/exp/ExpPackDefs.cpp                    |   238 +-
 core/sql/exp/ExpSeqGen.h                        |     1 -
 core/sql/exp/ExpSequenceFunction.cpp            |    35 -
 core/sql/exp/ExpSequenceFunction.h              |    48 +-
 core/sql/exp/ExpSqlTupp.cpp                     |     2 -
 core/sql/exp/ExpSqlTupp.h                       |    85 +-
 core/sql/exp/exp_aggregate.cpp                  |     6 -
 core/sql/exp/exp_arith.cpp                      |   498 +-
 core/sql/exp/exp_attrs.cpp                      |    79 +-
 core/sql/exp/exp_attrs.h                        |    22 +-
 core/sql/exp/exp_bignum.cpp                     |    86 +-
 core/sql/exp/exp_bignum.h                       |    66 +-
 core/sql/exp/exp_clause.cpp                     |   165 +-
 core/sql/exp/exp_clause.h                       |   152 +-
 core/sql/exp/exp_clause_derived.h               |   675 +-
 core/sql/exp/exp_comp.cpp                       |    76 -
 core/sql/exp/exp_conv.cpp                       |   350 +-
 core/sql/exp/exp_datetime.cpp                   |   529 +-
 core/sql/exp/exp_datetime.h                     |    90 +-
 core/sql/exp/exp_dp2_expr.cpp                   |     3 +-
 core/sql/exp/exp_dp2_expr.h                     |    35 +-
 core/sql/exp/exp_eval.cpp                       |    31 +-
 core/sql/exp/exp_expr.cpp                       |    52 +-
 core/sql/exp/exp_expr.h                         |   384 +-
 core/sql/exp/exp_fixup.cpp                      |    51 +-
 core/sql/exp/exp_function.cpp                   |  1026 +-
 core/sql/exp/exp_function.h                     |  1774 +-
 core/sql/exp/exp_function_lower_unicode.cpp     |     2 -
 core/sql/exp/exp_function_substring_unicode.cpp |     2 -
 core/sql/exp/exp_function_trim_unicode.cpp      |     4 -
 core/sql/exp/exp_function_upper_unicode.cpp     |     2 -
 core/sql/exp/exp_interval.cpp                   |     2 -
 core/sql/exp/exp_interval.h                     |     6 +-
 core/sql/exp/exp_like.cpp                       |    43 +-
 core/sql/exp/exp_like.h                         |    59 +-
 core/sql/exp/exp_math_func.cpp                  |    17 -
 core/sql/exp/exp_math_func.h                    |    44 +-
 core/sql/exp/exp_misc.cpp                       |     2 -
 core/sql/exp/exp_space.cpp                      |   407 -
 core/sql/exp/exp_space.h                        |    22 -
 core/sql/exp/exp_stdh.h                         |     7 +-
 core/sql/exp/exp_tuple_desc.cpp                 |    11 +-
 core/sql/exp/exp_tuple_desc.h                   |     7 +-
 core/sql/exp/srlversion.cpp                     |    41 -
 core/sql/export/ComDiags.cpp                    |    87 +-
 core/sql/export/ComDiags.h                      |   355 +-
 core/sql/export/ComMemoryDiags.h                |    10 +-
 core/sql/export/ExportDll.cpp                   |     3 +-
 core/sql/export/FBString.h                      |     2 +-
 core/sql/export/HeapID.h                        |    18 +-
 core/sql/export/HeapLog.cpp                     |    11 -
 core/sql/export/HeapLog.h                       |     3 +-
 core/sql/export/IpcMessageObj.cpp               |    32 -
 core/sql/export/IpcMessageObj.h                 |    85 +-
 core/sql/export/NAAbort.cpp                     |    15 +-
 core/sql/export/NABasicObject.cpp               |    36 +-
 core/sql/export/NABasicObject.h                 |    81 +-
 core/sql/export/NAInternalError.h               |     4 +-
 core/sql/export/NAStringDef.cpp                 |    39 -
 core/sql/export/NAStringDef.h                   |    89 +-
 core/sql/export/NAVersionedObject.cpp           |    24 +-
 core/sql/export/NAVersionedObject.h             |   829 +-
 core/sql/export/stubs.cpp                       |    53 -
 core/sql/generator/GenAll.cpp                   |     1 -
 core/sql/generator/GenExpGenerator.cpp          |   271 +-
 core/sql/generator/GenExpGenerator.h            |    28 +-
 core/sql/generator/GenExplain.cpp               |   202 +-
 core/sql/generator/GenFastTransport.cpp         |    20 +-
 core/sql/generator/GenItemExpr.cpp              |     8 +-
 core/sql/generator/GenItemFunc.cpp              |   322 +-
 core/sql/generator/GenKey.cpp                   |    18 +-
 core/sql/generator/GenMapTable.cpp              |    12 -
 core/sql/generator/GenMdamPred.cpp              |    16 -
 core/sql/generator/GenPartFunc.cpp              |     2 -
 core/sql/generator/GenPreCode.cpp               |   315 +-
 core/sql/generator/GenProbeCache.cpp            |    65 +-
 core/sql/generator/GenRel3GL.cpp                |     2 -
 core/sql/generator/GenRelDCL.cpp                |    53 +-
 core/sql/generator/GenRelEnforcer.cpp           |    57 +-
 core/sql/generator/GenRelExeUtil.cpp            |   616 +-
 core/sql/generator/GenRelGrby.cpp               |   178 +-
 core/sql/generator/GenRelJoin.cpp               |   217 +-
 core/sql/generator/GenRelMisc.cpp               |   324 +-
 core/sql/generator/GenRelPackedRows.cpp         |    54 +-
 core/sql/generator/GenRelScan.cpp               |    87 +-
 core/sql/generator/GenRelSequence.cpp           |   107 +-
 core/sql/generator/GenRelSet.cpp                |    10 +-
 core/sql/generator/GenRelUpdate.cpp             |   234 +-
 core/sql/generator/GenResources.cpp             |     2 -
 core/sql/generator/GenSequenceFunction.cpp      |    10 +-
 core/sql/generator/GenShape.cpp                 |     7 +
 core/sql/generator/GenStoredProc.cpp            |     4 +-
 core/sql/generator/GenUdr.cpp                   |     5 +-
 core/sql/generator/Generator.cpp                |   138 +-
 core/sql/generator/Generator.h                  |   127 +-
 core/sql/generator/LmExpr.cpp                   |     4 +-
 core/sql/generator/vers_libgenerator.cpp        |     2 -
 core/sql/langman/LmAssert.cpp                   |     2 -
 core/sql/langman/LmComQueue.cpp                 |     4 -
 core/sql/langman/LmComQueue.h                   |     3 -
 core/sql/langman/LmCommon.h                     |    26 +-
 core/sql/langman/LmContManager.cpp              |     6 -
 core/sql/langman/LmDebug.cpp                    |    12 +-
 core/sql/langman/LmDebug.h                      |     2 +-
 core/sql/langman/LmGenUtil.cpp                  |     2 -
 core/sql/langman/LmJavaExceptionReporter.cpp    |     6 -
 core/sql/langman/LmJavaHooks.cpp                |     2 -
 core/sql/langman/LmJavaOptions.h                |     2 -
 core/sql/langman/LmLangManager.cpp              |     8 +-
 core/sql/langman/LmLangManagerJava.cpp          |     4 +-
 core/sql/langman/LmResultSetJava.cpp            |     4 +-
 core/sql/langman/LmRoutine.h                    |     3 -
 core/sql/langman/LmSQLMXDriver.java             |    10 +-
 core/sql/langman/LmUtility.cpp                  |     8 -
 core/sql/langman/Measure.cpp                    |     2 +-
 core/sql/langman/vers_libtdm_sqllangman.cpp     |     2 -
 .../java/org/trafodion/libmgmt/JDBCUDR.java     |   721 +
 core/sql/nskgmake/Makerules.linux               |     2 +
 core/sql/nskgmake/SqlCompilerDebugger/Makefile  |     2 +
 core/sql/nskgmake/arkcmp/Makefile               |     3 +-
 core/sql/nskgmake/arkcmp_dll/Makefile           |     5 +-
 core/sql/nskgmake/arkcmplib/Makefile            |     2 -
 core/sql/nskgmake/comexe/Makefile               |     3 +-
 core/sql/nskgmake/executor/Makefile             |     9 +-
 core/sql/nskgmake/sqlcat/Makefile               |     4 +-
 core/sql/nskgmake/sqlci/Makefile                |     3 +-
 core/sql/nskgmake/sqlcilib/Makefile             |    15 +-
 core/sql/nskgmake/sqlcomp/Makefile              |     3 +
 core/sql/nskgmake/tdm_sqlcli/Makefile           |     4 +-
 core/sql/nskgmake/tdm_sqlexp/Makefile           |     2 +-
 core/sql/nskgmake/tdm_sqlmxevents/Makefile      |     1 -
 core/sql/nskgmake/tdm_sqlshare/Makefile         |     3 +-
 core/sql/nskgmake/udr_predef/Makefile           |     1 +
 core/sql/optimizer/AccessSets.cpp               |     4 -
 core/sql/optimizer/Analyzer.cpp                 |   128 +-
 core/sql/optimizer/Analyzer.h                   |    40 -
 core/sql/optimizer/AppliedStatMan.cpp           |     6 -
 core/sql/optimizer/AppliedStatMan.h             |     2 -
 core/sql/optimizer/BindItemExpr.cpp             |   742 +-
 core/sql/optimizer/BindRI.cpp                   |     2 -
 core/sql/optimizer/BindRelExpr.cpp              |   589 +-
 core/sql/optimizer/BindWA.cpp                   |    12 +-
 core/sql/optimizer/CascadesBasic.h              |     1 -
 core/sql/optimizer/ChangesTable.cpp             |    30 +-
 core/sql/optimizer/ChangesTable.h               |    14 +-
 core/sql/optimizer/ClusteredBitmap.cpp          |    16 +-
 core/sql/optimizer/CmpProcess.cpp               |    16 +-
 core/sql/optimizer/CmpProcess.h                 |     2 +-
 core/sql/optimizer/ColStatDesc.cpp              |    83 +-
 core/sql/optimizer/ColStatDesc.h                |     2 -
 core/sql/optimizer/ColumnDesc.cpp               |     2 -
 core/sql/optimizer/ColumnDesc.h                 |     4 -
 core/sql/optimizer/ColumnNameMap.h              |     4 -
 core/sql/optimizer/CompilationStats.cpp         |     6 +-
 core/sql/optimizer/CompilationStats.h           |     2 +-
 core/sql/optimizer/CompilerTracking.cpp         |     8 +-
 core/sql/optimizer/ControlDB.cpp                |    29 +-
 core/sql/optimizer/ControlDB.h                  |     4 -
 core/sql/optimizer/Cost.cpp                     |    30 -
 core/sql/optimizer/Cost.h                       |     7 -
 core/sql/optimizer/CostMethod.h                 |     6 +-
 core/sql/optimizer/CostScalar.h                 |    27 +-
 core/sql/optimizer/CostVector.h                 |     3 -
 core/sql/optimizer/EncodedKeyValue.cpp          |     2 +-
 core/sql/optimizer/EncodedValue.cpp             |   100 +-
 core/sql/optimizer/EncodedValue.h               |    11 +-
 core/sql/optimizer/EstLogProp.cpp               |     4 -
 core/sql/optimizer/EstLogProp.h                 |     7 +-
 core/sql/optimizer/GroupAttr.cpp                |    27 +-
 core/sql/optimizer/GroupAttr.h                  |    15 +-
 core/sql/optimizer/HDFSHook.cpp                 |    35 +-
 core/sql/optimizer/HDFSHook.h                   |    17 +-
 core/sql/optimizer/ImplRule.cpp                 |    77 +-
 core/sql/optimizer/ImplRule.h                   |    64 -
 core/sql/optimizer/IndexDesc.cpp                |    47 +-
 core/sql/optimizer/Inlining.cpp                 |   153 +-
 core/sql/optimizer/Inlining.h                   |     6 +-
 core/sql/optimizer/ItemArith.h                  |     6 +-
 core/sql/optimizer/ItemCache.cpp                |     8 +
 core/sql/optimizer/ItemColRef.h                 |    21 +-
 core/sql/optimizer/ItemConstr.h                 |     7 +-
 core/sql/optimizer/ItemExpr.cpp                 |   291 +-
 core/sql/optimizer/ItemExpr.h                   |    11 +-
 core/sql/optimizer/ItemExprList.cpp             |    11 +
 core/sql/optimizer/ItemFunc.h                   |   246 +-
 core/sql/optimizer/ItemLog.h                    |     3 -
 core/sql/optimizer/ItemNAType.h                 |     1 -
 core/sql/optimizer/ItemOther.h                  |     8 -
 core/sql/optimizer/ItemSample.cpp               |     4 +-
 core/sql/optimizer/ItemSubq.h                   |    10 -
 core/sql/optimizer/ItmBitMuxFunction.cpp        |     6 +-
 core/sql/optimizer/ItmBitMuxFunction.h          |     2 -
 core/sql/optimizer/ItmFlowControlFunction.cpp   |    12 -
 core/sql/optimizer/LargeScopeRules.cpp          |    40 -
 core/sql/optimizer/MJVIndexBuilder.cpp          |     8 +-
 core/sql/optimizer/MJVIndexBuilder.h            |    10 -
 core/sql/optimizer/MVCandidates.cpp             |    38 +-
 core/sql/optimizer/MVCandidates.h               |     2 -
 core/sql/optimizer/MVInfo.cpp                   |    72 +-
 core/sql/optimizer/MVInfo.h                     |    24 -
 core/sql/optimizer/MVJoinGraph.cpp              |     4 -
 core/sql/optimizer/MVJoinGraph.h                |     2 -
 core/sql/optimizer/MavRelRootBuilder.cpp        |     8 +-
 core/sql/optimizer/MjvBuilder.cpp               |     6 -
 core/sql/optimizer/MultiJoin.cpp                |    24 +-
 core/sql/optimizer/MultiJoin.h                  |     6 -
 core/sql/optimizer/MvLog.cpp                    |    10 -
 core/sql/optimizer/MvLog.h                      |     4 -
 core/sql/optimizer/MvMultiTxnMavBuilder.cpp     |    16 -
 core/sql/optimizer/MvRefreshBuilder.cpp         |    48 -
 core/sql/optimizer/MvRefreshBuilder.h           |    20 -
 core/sql/optimizer/NAClusterInfo.cpp            |     9 -
 core/sql/optimizer/NAClusterInfo.h              |     2 -
 core/sql/optimizer/NAColumn.cpp                 |   159 +-
 core/sql/optimizer/NAColumn.h                   |     1 -
 core/sql/optimizer/NARoutine.cpp                |     4 +-
 core/sql/optimizer/NARoutine.h                  |     2 -
 core/sql/optimizer/NATable.cpp                  |   283 +-
 core/sql/optimizer/NATable.h                    |    54 +-
 core/sql/optimizer/NodeMap.cpp                  |    43 -
 core/sql/optimizer/NormItemExpr.cpp             |    30 +-
 core/sql/optimizer/NormRelExpr.cpp              |   170 +-
 core/sql/optimizer/ObjectNames.cpp              |    41 +-
 core/sql/optimizer/ObjectNames.h                |    29 +-
 core/sql/optimizer/OptItemExpr.cpp              |     4 +-
 core/sql/optimizer/OptLogRelExpr.cpp            |    14 +-
 core/sql/optimizer/OptPhysRelExpr.cpp           |    94 +-
 core/sql/optimizer/OptRange.cpp                 |    71 +-
 core/sql/optimizer/OptTrigger.cpp               |    17 +-
 core/sql/optimizer/OptTrigger.h                 |     8 +-
 core/sql/optimizer/OptimizerSimulator.cpp       |    96 +-
 core/sql/optimizer/PackedColDesc.cpp            |    16 -
 core/sql/optimizer/PackedColDesc.h              |     3 -
 core/sql/optimizer/PartFunc.cpp                 |   169 +-
 core/sql/optimizer/PartFunc.h                   |     5 -
 core/sql/optimizer/PartKeyDist.cpp              |     6 -
 core/sql/optimizer/PartReq.cpp                  |    56 -
 core/sql/optimizer/PartReq.h                    |     7 -
 core/sql/optimizer/PhyProp.cpp                  |    29 +-
 core/sql/optimizer/PhyProp.h                    |    14 +-
 core/sql/optimizer/QRDescGenerator.cpp          |    51 +-
 core/sql/optimizer/QRDescriptorExtentions.cpp   |     2 +-
 core/sql/optimizer/QueryGraph.cpp               |    10 -
 core/sql/optimizer/QueryRewriteHandler.cpp      |    18 +-
 core/sql/optimizer/QueryRewriteHandler.h        |     2 +-
 core/sql/optimizer/RETDesc.cpp                  |     2 -
 core/sql/optimizer/Refresh.cpp                  |     4 -
 core/sql/optimizer/Refresh.h                    |    26 -
 core/sql/optimizer/Rel3GL.cpp                   |     2 -
 core/sql/optimizer/RelCache.cpp                 |    20 +-
 core/sql/optimizer/RelEnforcer.h                |    14 +-
 core/sql/optimizer/RelExeUtil.cpp               |   364 +-
 core/sql/optimizer/RelExeUtil.h                 |   198 +-
 core/sql/optimizer/RelExpr.cpp                  |   238 +-
 core/sql/optimizer/RelExpr.h                    |    27 +-
 core/sql/optimizer/RelFastTransport.cpp         |    77 +-
 core/sql/optimizer/RelFastTransport.h           |     2 +-
 core/sql/optimizer/RelGrby.h                    |    10 +-
 core/sql/optimizer/RelJoin.h                    |    18 +-
 core/sql/optimizer/RelMisc.h                    |    27 +-
 core/sql/optimizer/RelPackedRows.h              |     1 -
 core/sql/optimizer/RelProbeCache.h              |     4 +-
 core/sql/optimizer/RelRoutine.cpp               |    12 +-
 core/sql/optimizer/RelRoutine.h                 |     2 +-
 core/sql/optimizer/RelSample.h                  |     2 -
 core/sql/optimizer/RelScan.h                    |    25 +-
 core/sql/optimizer/RelSequence.h                |     9 +-
 core/sql/optimizer/RelSet.h                     |     4 +-
 core/sql/optimizer/RelStoredProc.cpp            |    10 +-
 core/sql/optimizer/RelUpdate.h                  |    19 -
 core/sql/optimizer/ReqGen.cpp                   |    10 -
 core/sql/optimizer/RoutineDesc.cpp              |     4 -
 core/sql/optimizer/RoutineInvocation.h          |    82 -
 core/sql/optimizer/Rule.cpp                     |    18 +-
 core/sql/optimizer/Rule.h                       |    13 -
 core/sql/optimizer/ScanOptimizer.cpp            |  1620 +-
 core/sql/optimizer/ScanOptimizer.h              |    34 +-
 core/sql/optimizer/SchemaDB.cpp                 |    13 +-
 core/sql/optimizer/SchemaDB.h                   |    13 +-
 core/sql/optimizer/ScmCostMethod.cpp            |     5 +-
 core/sql/optimizer/SearchKey.cpp                |    28 +-
 core/sql/optimizer/SimpleScanOptimizer.h        |    13 +-
 core/sql/optimizer/Stats.cpp                    |    99 +-
 core/sql/optimizer/Stats.h                      |    27 -
 core/sql/optimizer/SynthType.cpp                |   669 +-
 core/sql/optimizer/TableDesc.cpp                |    14 +-
 core/sql/optimizer/TableDesc.h                  |     9 -
 core/sql/optimizer/TransRule.cpp                |    26 +-
 core/sql/optimizer/TransRule.h                  |    55 +-
 core/sql/optimizer/TriggerDB.cpp                |    20 -
 core/sql/optimizer/TriggerDB.h                  |     1 -
 core/sql/optimizer/Triggers.cpp                 |    28 -
 core/sql/optimizer/Triggers.h                   |    20 +-
 core/sql/optimizer/UdfDllInteraction.cpp        |    65 +-
 core/sql/optimizer/VEGTable.cpp                 |    36 -
 core/sql/optimizer/VEGTable.h                   |     2 +-
 core/sql/optimizer/ValueDesc.cpp                |   143 +-
 core/sql/optimizer/ValueDesc.h                  |     2 +
 core/sql/optimizer/costmethod.cpp               |    76 +-
 core/sql/optimizer/disjunct.h                   |     2 -
 core/sql/optimizer/hiveHook.h                   |    27 +-
 core/sql/optimizer/mdam.cpp                     |    87 +-
 core/sql/optimizer/memo.cpp                     |    42 +-
 core/sql/optimizer/opt.cpp                      |    48 +-
 core/sql/optimizer/opt.h                        |     8 -
 core/sql/optimizer/tasks.cpp                    |    22 -
 core/sql/optimizer/vers_liboptimizer.cpp        |     2 -
 core/sql/parser/AllStmtDDL.h                    |     2 +
 core/sql/parser/AllStmtDDLCreate.h              |     1 +
 core/sql/parser/BindStmtDDL.cpp                 |    60 +-
 core/sql/parser/ElemDDLCol.cpp                  |    41 +-
 core/sql/parser/ElemDDLColDef.h                 |     9 +
 core/sql/parser/ElemDDLColDefault.h             |    17 +
 core/sql/parser/ElemDDLConstraintPK.h           |    23 +-
 .../ElemDDLCreateMVOneAttributeTableList.cpp    |     2 -
 .../ElemDDLCreateMVOneAttributeTableList.h      |     2 -
 core/sql/parser/ElemDDLFileAttr.cpp             |     6 -
 core/sql/parser/ElemDDLLikeOptions.cpp          |    25 +
 core/sql/parser/ElemDDLLikeOptions.h            |    28 +
 core/sql/parser/ElemDDLList.h                   |     2 -
 core/sql/parser/ElemDDLLobAttrs.h               |     2 -
 core/sql/parser/ElemDDLLoggable.h               |     1 -
 core/sql/parser/ElemDDLNode.cpp                 |    23 +-
 core/sql/parser/ElemDDLNode.h                   |     6 +
 core/sql/parser/ElemDDLPartition.cpp            |     6 +-
 core/sql/parser/ElemDDLTableFeature.h           |     1 -
 core/sql/parser/ElemDDLUdr.cpp                  |     4 -
 core/sql/parser/HvRoles.h                       |     3 +-
 core/sql/parser/HvRoles_templ.cpp               |     2 +-
 core/sql/parser/ParDDLFileAttrs.cpp             |    14 -
 core/sql/parser/ParDDLLikeOpts.cpp              |    17 +
 core/sql/parser/ParDDLLikeOptsCreateTable.h     |    27 +
 core/sql/parser/ParKeyWords.cpp                 |   240 +-
 core/sql/parser/ParKeyWords.h                   |    24 +-
 core/sql/parser/ParNameLocList.cpp              |    22 -
 core/sql/parser/SqlParserAux.cpp                |   164 +-
 core/sql/parser/SqlParserAux.h                  |    15 +-
 core/sql/parser/StmtDDLAlterMV.h                |     4 -
 core/sql/parser/StmtDDLCleanupObjects.h         |     4 +-
 core/sql/parser/StmtDDLCommentOn.h              |   154 +
 core/sql/parser/StmtDDLCreate.cpp               |   112 +-
 .../parser/StmtDDLCreateComponentPrivilege.h    |     2 -
 core/sql/parser/StmtDDLCreateMV.h               |     8 -
 core/sql/parser/StmtDDLCreateTable.h            |     8 +
 core/sql/parser/StmtDDLCreateTrigger.h          |     2 -
 core/sql/parser/StmtDDLCreateView.h             |     7 +
 core/sql/parser/StmtDDLDrop.cpp                 |     5 +-
 core/sql/parser/StmtDDLDropComponentPrivilege.h |     2 -
 core/sql/parser/StmtDDLDropMV.h                 |     2 -
 core/sql/parser/StmtDDLDropView.h               |     6 +
 .../sql/parser/StmtDDLGrantComponentPrivilege.h |     2 -
 core/sql/parser/StmtDDLMisc.cpp                 |     2 -
 core/sql/parser/StmtDDLNode.cpp                 |     8 -
 core/sql/parser/StmtDDLRegOrUnregHive.cpp       |     4 +-
 core/sql/parser/StmtDDLRegOrUnregHive.h         |     6 +-
 .../parser/StmtDDLRevokeComponentPrivilege.h    |     2 -
 core/sql/parser/StmtDDLonHiveObjects.h          |   199 +
 core/sql/parser/StmtNode.h                      |     3 -
 core/sql/parser/sqlparser.y                     |  2957 ++--
 core/sql/parser/ulexer.cpp                      |    68 +-
 core/sql/parser/ulexer.h                        |     7 -
 core/sql/parser/vers_libparser.cpp              |     2 -
 core/sql/pom.xml                                |     6 +
 core/sql/pom.xml.apache                         |     6 +
 core/sql/pom.xml.hdp                            |     6 +
 core/sql/porting_layer/PortProcessCalls.cpp     |    56 +-
 core/sql/porting_layer/PortProcessCalls.h       |    14 +-
 core/sql/qms/QRDescriptorStubs.cpp              |     2 -
 core/sql/qms/QmmMain.cpp                        |    19 -
 core/sql/qms/QmmQmm.cpp                         |   487 -
 core/sql/qms/QmmQmm.h                           |    38 -
 core/sql/qms/QmpMain.cpp                        |    17 -
 core/sql/qms/QmpPublish.cpp                     |     8 +-
 core/sql/qms/QmsGroupLattice.cpp                |     4 -
 core/sql/qms/QmsInitializer.cpp                 |    10 -
 core/sql/qms/QmsJoinGraph.cpp                   |    22 +-
 core/sql/qms/QmsLatticeIndex.cpp                |    14 -
 core/sql/qms/QmsMVMemo.cpp                      |    12 +-
 core/sql/qms/QmsMain.cpp                        |    19 -
 core/sql/qms/QmsQms.cpp                         |    14 -
 core/sql/qms/QmsRequest.cpp                     |    48 +-
 core/sql/qms/QmsRequest.h                       |     4 +-
 core/sql/qms/QmsSelfJoinHandler.cpp             |     6 -
 core/sql/qms/QmsStubs.cpp                       |     2 -
 core/sql/qmscommon/QRDescriptor.cpp             |   122 +-
 core/sql/qmscommon/QRDescriptor.h               |    52 +-
 core/sql/qmscommon/QRLogger.cpp                 |   109 +-
 core/sql/qmscommon/QRLogger.h                   |    21 +-
 core/sql/qmscommon/QRQueries.cpp                |   299 +-
 core/sql/qmscommon/QRQueries.h                  |     2 -
 core/sql/qmscommon/QRQueries.sql                |     4 -
 core/sql/qmscommon/QRQueriesImpl.cpp            |    16 +-
 core/sql/qmscommon/QueryRewriteServer.cpp       |    44 +-
 core/sql/qmscommon/Range.cpp                    |    38 +-
 core/sql/qmscommon/XMLUtil.h                    |    14 +-
 core/sql/qmscommon/vers_libqmscommon.cpp        |     2 -
 core/sql/refresh/RuAuditRefreshTaskExecutor.h   |     2 -
 core/sql/refresh/RuDeltaDef.cpp                 |    16 -
 core/sql/refresh/RuDupElimGlobals.cpp           |     4 -
 core/sql/refresh/RuDupElimLogRecord.cpp         |     4 -
 core/sql/refresh/RuDupElimLogScanner.cpp        |     2 -
 core/sql/refresh/RuDupElimLogScanner.h          |     2 -
 core/sql/refresh/RuDupElimTaskExUnit.cpp        |     2 -
 core/sql/refresh/RuDupElimTaskExecutor.cpp      |    18 -
 core/sql/refresh/RuEmpCheckTaskExecutor.cpp     |     8 -
 core/sql/refresh/RuEmpCheckTaskExecutor.h       |     2 -
 core/sql/refresh/RuException.cpp                |    20 -
 core/sql/refresh/RuExecController.cpp           |     8 -
 core/sql/refresh/RuForceOptions.cpp             |     2 -
 core/sql/refresh/RuForceOptions.h               |     4 -
 core/sql/refresh/RuForceOptionsParser.cpp       |     4 -
 core/sql/refresh/RuForceOptionsParser.h         |     2 -
 core/sql/refresh/RuLockEquivSetTaskExecutor.h   |     4 -
 core/sql/refresh/RuLogCleanupTaskExecutor.cpp   |     6 -
 core/sql/refresh/RuLogCleanupTaskExecutor.h     |     4 -
 core/sql/refresh/RuMVEquivSetBuilder.cpp        |     2 -
 core/sql/refresh/RuMVEquivSetBuilder.h          |     2 -
 .../refresh/RuMultiTxnRefreshTaskExecutor.cpp   |    14 -
 core/sql/refresh/RuOptions.cpp                  |    18 -
 core/sql/refresh/RuRcReleaseTaskExecutor.h      |     2 -
 core/sql/refresh/RuRefreshSQLComposer.cpp       |    14 -
 core/sql/refresh/RuRefreshTaskExecutor.cpp      |    50 -
 .../refresh/RuSQLDynamicStatementContainer.cpp  |     6 -
 core/sql/refresh/RuSQLStatementContainer.cpp    |    12 -
 .../sql/refresh/RuSimpleRefreshTaskExecutor.cpp |    12 -
 core/sql/refresh/RuTableSyncTaskExecutor.cpp    |     4 -
 core/sql/refresh/RuTableSyncTaskExecutor.h      |     2 -
 core/sql/refresh/RuTask.cpp                     |     6 -
 core/sql/refresh/RuTaskExecutor.cpp             |    14 -
 core/sql/refresh/RuTaskExecutor.h               |     2 -
 core/sql/refresh/RuTaskServerExecControler.cpp  |     2 -
 core/sql/refresh/RuTbl.cpp                      |     2 -
 core/sql/refresh/RuTestTaskExecutor.cpp         |    18 -
 core/sql/refresh/RuTestTaskExecutor.h           |     2 -
 .../refresh/RuUnAuditRefreshTaskExecutor.cpp    |    16 -
 core/sql/refresh/RuUnAuditRefreshTaskExecutor.h |     2 -
 core/sql/regress/charsets/DIFF312.KNOWN.SB.OS   |    12 +-
 core/sql/regress/charsets/EXPECTED314           |     4 +-
 core/sql/regress/charsets/EXPECTED315           |     2 +-
 core/sql/regress/charsets/TEST014               |     5 +
 .../sql/regress/compGeneral/DIFF005.KNOWN.SB.OS |     4 +-
 .../sql/regress/compGeneral/DIFF006.KNOWN.SB.OS |    12 -
 core/sql/regress/compGeneral/EXPECTED001.SB     |    30 +-
 core/sql/regress/compGeneral/EXPECTED006.SB     |    91 +-
 core/sql/regress/compGeneral/EXPECTED013.SB     |    12 +-
 core/sql/regress/compGeneral/EXPECTED015.SB     |    18 +-
 core/sql/regress/compGeneral/EXPECTED023        |    99 +-
 core/sql/regress/compGeneral/EXPECTED042        |   139 +-
 core/sql/regress/compGeneral/EXPECTED045        |    92 +-
 core/sql/regress/compGeneral/EXPECTED071        |    35 +-
 core/sql/regress/compGeneral/EXPECTED072        |  1157 ++
 core/sql/regress/compGeneral/EXPECTEDTOK        |    44 +
 core/sql/regress/compGeneral/EXPECTEDTOK2       |    11 +-
 core/sql/regress/compGeneral/FILTER023          |     2 +-
 core/sql/regress/compGeneral/FILTER045          |    17 +
 core/sql/regress/compGeneral/FILTER072          |    17 +
 core/sql/regress/compGeneral/FILTERTOK          |    31 +
 core/sql/regress/compGeneral/TEST001            |    12 +-
 core/sql/regress/compGeneral/TEST006            |    12 +-
 core/sql/regress/compGeneral/TEST023            |     4 +
 core/sql/regress/compGeneral/TEST045            |    46 +-
 core/sql/regress/compGeneral/TEST071            |    10 +
 core/sql/regress/compGeneral/TEST072            |   262 +
 core/sql/regress/compGeneral/TEST072.cpp        |    20 +
 core/sql/regress/compGeneral/TEST072.java       |    32 +
 core/sql/regress/compGeneral/TESTTOK            |    21 +
 core/sql/regress/compGeneral/TESTTOK.sh         |    51 +
 core/sql/regress/core/DIFF024.KNOWN.SB.OS       |     4 +-
 core/sql/regress/core/DIFF038.KNOWN.LINUX       |     3 +
 core/sql/regress/core/EXPECTED000.SB            |     8 +-
 core/sql/regress/core/EXPECTED002.LINUX         |   219 +-
 core/sql/regress/core/EXPECTED005.SB            |    11 +-
 core/sql/regress/core/EXPECTED020.SB            |    99 +-
 core/sql/regress/core/EXPECTED037.SB            |   859 +-
 core/sql/regress/core/EXPECTED038.LINUX         |   160 +-
 core/sql/regress/core/EXPECTED056.SB            |     6 +
 core/sql/regress/core/EXPECTED116               |   215 +-
 core/sql/regress/core/EXPECTED131               |     8 +-
 core/sql/regress/core/EXPECTED162               |   762 +-
 core/sql/regress/core/EXPECTED163               |    63 +
 core/sql/regress/core/EXPECTEDRTS               |  2118 +--
 core/sql/regress/core/FILTER019                 |     4 +-
 core/sql/regress/core/FILTERRTS                 |     7 +-
 core/sql/regress/core/TEST000                   |    22 +-
 core/sql/regress/core/TEST002                   |    86 +
 core/sql/regress/core/TEST020                   |     8 +-
 core/sql/regress/core/TEST038                   |    24 +-
 core/sql/regress/core/TEST056                   |     2 +
 core/sql/regress/core/TEST131                   |     4 +-
 core/sql/regress/core/TEST163                   |   115 +
 core/sql/regress/core/TESTRTS                   |     1 +
 core/sql/regress/executor/DIFF001.KNOWN.SB      |     9 +-
 core/sql/regress/executor/EXPECTED001           |     3 +-
 core/sql/regress/executor/EXPECTED002.SB        |   292 +-
 core/sql/regress/executor/EXPECTED012           |   598 +-
 core/sql/regress/executor/EXPECTED013.SB        |     9 +-
 core/sql/regress/executor/EXPECTED015.SB        |   150 +
 core/sql/regress/executor/EXPECTED016.SB        |    20 +-
 core/sql/regress/executor/EXPECTED020           |     8 +-
 core/sql/regress/executor/EXPECTED022.SB        |  6043 +------
 core/sql/regress/executor/EXPECTED063           |    24 +-
 core/sql/regress/executor/EXPECTED107           |    47 +
 core/sql/regress/executor/EXPECTED122           |    27 +-
 core/sql/regress/executor/EXPECTED130           |   117 +-
 core/sql/regress/executor/EXPECTED131           |     4 +
 core/sql/regress/executor/EXPECTED140           |    29 +-
 core/sql/regress/executor/FILTER002             |     3 +
 core/sql/regress/executor/FILTER131             |     2 +
 core/sql/regress/executor/FILTER140             |     2 +
 core/sql/regress/executor/TEST002               |   130 +
 core/sql/regress/executor/TEST012               |   103 +-
 core/sql/regress/executor/TEST013               |     2 +-
 core/sql/regress/executor/TEST015               |    62 +
 core/sql/regress/executor/TEST016               |     7 +-
 core/sql/regress/executor/TEST022               |  1088 +-
 core/sql/regress/executor/TEST063               |     3 +-
 core/sql/regress/executor/TEST107               |     6 +
 core/sql/regress/executor/TEST122               |     5 +-
 core/sql/regress/executor/TEST130               |    21 +
 core/sql/regress/fullstack2/EXPECTED062         |    11 -
 core/sql/regress/fullstack2/EXPECTED062.RELEASE |    11 -
 core/sql/regress/fullstack2/TEST062             |     2 -
 core/sql/regress/hive/DIFF002.KNOWN             |    14 +
 core/sql/regress/hive/DIFF003.KNOWN             |    56 +-
 core/sql/regress/hive/DIFF008.KNOWN             |     7 +
 core/sql/regress/hive/DIFF009.KNOWN             |     3 +
 core/sql/regress/hive/EXPECTED001               |   762 +-
 core/sql/regress/hive/EXPECTED002               |    24 +-
 core/sql/regress/hive/EXPECTED003               |    10 +-
 core/sql/regress/hive/EXPECTED004               |    28 +-
 core/sql/regress/hive/EXPECTED005               |   230 +-
 core/sql/regress/hive/EXPECTED007               |   388 +-
 core/sql/regress/hive/EXPECTED008               |  1366 ++
 core/sql/regress/hive/EXPECTED009               |   143 +-
 core/sql/regress/hive/EXPECTED017               |    15 +-
 core/sql/regress/hive/EXPECTED018               |   838 +-
 core/sql/regress/hive/FILTER002                 |    33 +
 core/sql/regress/hive/FILTER005                 |     3 +
 core/sql/regress/hive/FILTER008                 |    36 +
 core/sql/regress/hive/FILTER009                 |     1 +
 core/sql/regress/hive/TEST002                   |     2 +-
 core/sql/regress/hive/TEST003                   |     2 +-
 core/sql/regress/hive/TEST005                   |    57 +-
 core/sql/regress/hive/TEST005_a.hive.sql        |     2 +
 core/sql/regress/hive/TEST007                   |    53 +-
 core/sql/regress/hive/TEST008                   |   361 +
 core/sql/regress/hive/TEST009                   |     4 +-
 core/sql/regress/hive/TEST009_a.hive.sql        |     8 +-
 core/sql/regress/hive/TEST009_b.hive.sql        |    30 +-
 core/sql/regress/hive/TEST017                   |     7 +-
 core/sql/regress/hive/TEST018                   |   160 +-
 .../hive/TEST018_create_hive_tables.hive        |    20 +-
 core/sql/regress/privs1/EXPECTED120             |    80 +-
 core/sql/regress/privs1/EXPECTED123             |  1173 +-
 core/sql/regress/privs1/EXPECTED125             |  1757 +-
 core/sql/regress/privs1/EXPECTED132             |   961 +-
 core/sql/regress/privs1/EXPECTED133             |   Bin 27095 -> 27095 bytes
 core/sql/regress/privs1/EXPECTED136             |     9 +-
 core/sql/regress/privs1/EXPECTED137             |    45 +-
 core/sql/regress/privs1/EXPECTED141             |   Bin 102260 -> 39037 bytes
 core/sql/regress/privs1/TEST120                 |    28 +-
 core/sql/regress/privs1/TEST123                 |    46 +
 core/sql/regress/privs1/TEST125                 |    71 +-
 core/sql/regress/privs1/TEST132                 |   145 +-
 core/sql/regress/privs1/TEST137                 |    23 +-
 core/sql/regress/privs1/TEST141                 |   161 +-
 core/sql/regress/privs2/EXPECTED129             |    36 +-
 core/sql/regress/privs2/EXPECTED135             |    33 +-
 core/sql/regress/privs2/EXPECTED138             |   111 +-
 core/sql/regress/privs2/EXPECTED140             |    19 +-
 core/sql/regress/privs2/EXPECTED143             |    28 +-
 core/sql/regress/privs2/EXPECTED144             |   410 +-
 core/sql/regress/privs2/EXPECTED146             |  1809 +++
 core/sql/regress/privs2/FILTER146               |    38 +
 core/sql/regress/privs2/TEST138                 |     1 +
 core/sql/regress/privs2/TEST143                 |     3 +
 core/sql/regress/privs2/TEST144                 |    42 +-
 core/sql/regress/privs2/TEST146                 |   255 +
 core/sql/regress/qat/eqatdml01                  |   230 +-
 core/sql/regress/qat/eqatdml02                  |   386 +-
 core/sql/regress/qat/eqatdml03                  |   124 +-
 core/sql/regress/qat/eqatdml04                  |   384 +-
 core/sql/regress/qat/eqatdml05                  | 14344 ++++++++---------
 core/sql/regress/qat/eqatdml06                  |  1352 +-
 core/sql/regress/qat/eqatdml07                  |  1930 +--
 core/sql/regress/qat/eqatdml08                  |    50 +-
 core/sql/regress/qat/eqatdml09                  |    54 +-
 core/sql/regress/qat/eqatdml10                  |  3026 ++--
 core/sql/regress/qat/eqatdml11                  |  3026 ++--
 core/sql/regress/qat/eqatdml14                  |   256 +-
 core/sql/regress/qat/qatdml01                   |    34 +-
 core/sql/regress/qat/qatdml02                   |    34 +-
 core/sql/regress/qat/qatdml03                   |    28 +-
 core/sql/regress/qat/qatdml04                   |    58 +-
 core/sql/regress/qat/qatdml05                   |    78 +-
 core/sql/regress/qat/qatdml06                   |    76 +-
 core/sql/regress/qat/qatdml07                   |    42 +-
 core/sql/regress/qat/qatdml08                   |    50 +-
 core/sql/regress/qat/qatdml09                   |    50 +-
 core/sql/regress/qat/qatdml10                   |    66 +-
 core/sql/regress/qat/qatdml11                   |    66 +-
 core/sql/regress/qat/qatdml14                   |    76 +-
 core/sql/regress/seabase/DIFF003.KNOWN          |    12 +
 core/sql/regress/seabase/DIFF031.KNOWN          |     6 -
 core/sql/regress/seabase/EXPECTED002            |   491 +-
 core/sql/regress/seabase/EXPECTED003            |     6 +-
 core/sql/regress/seabase/EXPECTED010            |  2002 ++-
 core/sql/regress/seabase/EXPECTED011            |   101 +-
 core/sql/regress/seabase/EXPECTED012            |    27 +
 core/sql/regress/seabase/EXPECTED016            |   175 +-
 core/sql/regress/seabase/EXPECTED020            |   139 +-
 core/sql/regress/seabase/EXPECTED022            |   145 +-
 core/sql/regress/seabase/EXPECTED024            |     3 +
 core/sql/regress/seabase/EXPECTED025            |    14 +-
 core/sql/regress/seabase/EXPECTED026            |    34 +-
 core/sql/regress/seabase/EXPECTED027            |    14 +-
 core/sql/regress/seabase/EXPECTED030            |   246 +
 core/sql/regress/seabase/EXPECTED031            |    82 +-
 core/sql/regress/seabase/EXPECTED032            |   248 +-
 core/sql/regress/seabase/FILTER002              |     7 +-
 core/sql/regress/seabase/FILTER034              |    33 +
 core/sql/regress/seabase/TEST002                |    54 +-
 core/sql/regress/seabase/TEST010                |   231 +-
 core/sql/regress/seabase/TEST020                |    42 +-
 core/sql/regress/seabase/TEST022                |    11 +
 core/sql/regress/seabase/TEST025                |     1 +
 core/sql/regress/seabase/TEST026                |     4 +-
 core/sql/regress/seabase/TEST026_drop_hbase     |    26 +
 core/sql/regress/seabase/TEST030                |    33 +
 core/sql/regress/seabase/TEST031                |    20 +-
 core/sql/regress/seabase/TEST032                |    56 +
 core/sql/regress/tools/logsort_src/line.c       |    26 +-
 core/sql/regress/tools/logsort_src/line.h       |     1 +
 core/sql/regress/tools/logsort_src/logsort.c    |    13 +
 core/sql/regress/tools/logsort_src/tokstr.c     |     2 +-
 core/sql/regress/tools/regress-filter-linux     |     4 +-
 core/sql/regress/tools/runallsb                 |    27 +
 core/sql/regress/tools/runregr                  |    29 +
 core/sql/regress/tools/runregr_charsets.ksh     |     5 +
 core/sql/regress/tools/runregr_checktest1.ksh   |     4 +
 core/sql/regress/tools/runregr_checktest2.ksh   |     4 +
 core/sql/regress/tools/runregr_checktests.ksh   |   528 +
 core/sql/regress/tools/runregr_compGeneral.ksh  |    26 +-
 core/sql/regress/tools/runregr_core.ksh         |     7 +-
 core/sql/regress/tools/runregr_executor.ksh     |     5 +
 core/sql/regress/tools/runregr_fullstack2.ksh   |     5 +
 core/sql/regress/tools/runregr_hive.ksh         |     9 +-
 core/sql/regress/tools/runregr_privs1.ksh       |    13 +-
 core/sql/regress/tools/runregr_privs2.ksh       |    11 +-
 core/sql/regress/tools/runregr_seabase.ksh      |     5 +
 core/sql/regress/tools/runregr_udr.ksh          |     5 +
 core/sql/regress/udr/DIFF101.KNOWN.SB           |     3 +
 core/sql/regress/udr/EXPECTED001                |    30 +-
 core/sql/regress/udr/EXPECTED002                |    97 +-
 core/sql/regress/udr/EXPECTED100.SB             |    47 +-
 core/sql/regress/udr/EXPECTED102                |    32 +
 core/sql/regress/udr/EXPECTED103                |   131 +
 core/sql/regress/udr/EXPECTED107.SB             |     9 +-
 core/sql/regress/udr/TEST001                    |    13 +
 core/sql/regress/udr/TEST001_Sessionize.java    |   142 +-
 core/sql/regress/udr/TEST002                    |    58 +-
 core/sql/regress/udr/TEST100                    |    22 +-
 core/sql/regress/udr/TEST103                    |    22 +
 core/sql/regress/udr/TEST103_functions.cpp      |    33 +-
 core/sql/regress/udr/TEST107                    |     2 -
 core/sql/regress/udr/t100.java                  |     4 +
 core/sql/runtimestats/CancelBroker.cpp          |    14 +-
 core/sql/runtimestats/RtsStubs.cpp              |     2 -
 core/sql/runtimestats/SqlStats.cpp              |   327 +-
 core/sql/runtimestats/SqlStats.h                |    48 +-
 core/sql/runtimestats/rts_msg.cpp               |    39 +
 core/sql/runtimestats/rts_msg.h                 |    42 +-
 core/sql/runtimestats/sscpipc.cpp               |   130 +-
 core/sql/runtimestats/sscpipc.h                 |     1 +
 core/sql/runtimestats/ssmpipc.cpp               |   266 +-
 core/sql/runtimestats/ssmpipc.h                 |    14 +-
 core/sql/smdio/vers_libsmdio.cpp                |     2 -
 core/sql/sort/CommonStructs.h                   |     3 -
 core/sql/sort/DiskPool_base.h                   |     6 +-
 core/sql/sort/DiskPool_sq.h                     |     4 +-
 core/sql/sort/Qsort.cpp                         |     7 +-
 core/sql/sort/Record.cpp                        |     2 -
 core/sql/sort/RunDirectory.cpp                  |     6 +-
 core/sql/sort/ScratchFileConnection.h           |     4 +-
 core/sql/sort/ScratchFileMap.cpp                |     8 +-
 core/sql/sort/ScratchSpace.cpp                  |   108 +-
 core/sql/sort/SortAlgo.cpp                      |     8 +-
 core/sql/sort/SortError.h                       |     2 +-
 core/sql/sort/SortTopN.cpp                      |     6 +-
 core/sql/sort/SortUtil.cpp                      |    73 +-
 core/sql/sort/SortUtilCfg.cpp                   |     4 +-
 core/sql/sort/SortUtilCfg.h                     |     6 +-
 core/sql/sort/Statistics.cpp                    |     2 -
 core/sql/sort/Statistics.h                      |     3 -
 core/sql/sort/TourTree.cpp                      |     5 -
 core/sql/sort/TreeNode.cpp                      |    10 +-
 core/sql/sort/diskpool_sq.cpp                   |     6 +-
 core/sql/sort/scratchfile_base.cpp              |     6 +-
 core/sql/sort/scratchfileconnection.cpp         |     2 -
 core/sql/sort/vers_libsort.cpp                  |     2 -
 core/sql/sqlcat/ReadTableDef.cpp                |    95 -
 core/sql/sqlcat/ReadTableDef.h                  |    98 -
 core/sql/sqlcat/TrafDDLdesc.cpp                 |    65 +
 core/sql/sqlcat/enum.h                          |    62 -
 core/sql/sqlcat/readRealArk.cpp                 |   123 -
 core/sql/sqlcat/readRealArk.h                   |    31 -
 core/sql/sqlcat/vers_libsqlcat.cpp              |     3 -
 core/sql/sqlci/CSInterface.h                    |    84 -
 core/sql/sqlci/CharSetConstants.cpp             |    47 -
 core/sql/sqlci/CharSetConstants.h               |    30 -
 core/sql/sqlci/Define.cpp                       |   204 -
 core/sql/sqlci/Define.h                         |    42 -
 core/sql/sqlci/Formatter.cpp                    |     4 -
 core/sql/sqlci/InputStmt.cpp                    |    42 +-
 core/sql/sqlci/Log.cpp                          |    51 -
 core/sql/sqlci/MsgCat.cpp                       |    76 -
 core/sql/sqlci/MsgCat.h                         |    82 -
 core/sql/sqlci/MxciEHCallBack.cpp               |    53 -
 core/sql/sqlci/MxciEHCallBack.h                 |    56 -
 core/sql/sqlci/Obey.cpp                         |    14 -
 core/sql/sqlci/Param.cpp                        |    16 +-
 core/sql/sqlci/Param.h                          |     2 +-
 core/sql/sqlci/Prepare.cpp                      |    11 -
 core/sql/sqlci/RWInterface.cpp                  |   119 -
 core/sql/sqlci/RWInterface.h                    |   155 -
 core/sql/sqlci/ShellCmd.cpp                     |     2 +-
 core/sql/sqlci/ShellCmd.h                       |     7 -
 core/sql/sqlci/SqlCmd.cpp                       |   188 +-
 core/sql/sqlci/Sqlci.h                          |     3 -
 core/sql/sqlci/SqlciCSCmd.cpp                   |   341 -
 core/sql/sqlci/SqlciCSCmd.h                     |   158 -
 core/sql/sqlci/SqlciCSSimulator.cpp             |   112 -
 core/sql/sqlci/SqlciCmd.cpp                     |   108 +-
 core/sql/sqlci/SqlciCmd.h                       |    54 +-
 core/sql/sqlci/SqlciDefs.h                      |     4 -
 core/sql/sqlci/SqlciEnv.cpp                     |   129 +-
 core/sql/sqlci/SqlciEnv.h                       |    56 +-
 core/sql/sqlci/SqlciError.cpp                   |    12 -
 core/sql/sqlci/SqlciError.h                     |     4 -
 core/sql/sqlci/SqlciHelp.cpp                    |   244 -
 core/sql/sqlci/SqlciList_templ.h                |     2 -
 core/sql/sqlci/SqlciNode.cpp                    |    30 -
 core/sql/sqlci/SqlciNode.h                      |    10 -
 core/sql/sqlci/SqlciParser.cpp                  |   101 +-
 core/sql/sqlci/SqlciRWCmd.cpp                   |  1172 --
 core/sql/sqlci/SqlciRWCmd.h                     |   299 -
 core/sql/sqlci/SqlciRWSimulator.cpp             |   375 -
 core/sql/sqlci/SqlciReset.cpp                   |    45 -
 core/sql/sqlci/SqlciShow.cpp                    |    21 -
 core/sql/sqlci/SqlciStats.h                     |     2 +-
 core/sql/sqlci/SqlciStmts.cpp                   |     8 -
 core/sql/sqlci/SqlciUsage.cpp                   |   889 -
 core/sql/sqlci/SqlciUtil.cpp                    |    59 -
 core/sql/sqlci/SqlciUtil.h                      |    77 -
 core/sql/sqlci/UtilInt.cpp                      |    86 -
 core/sql/sqlci/UtilInt.h                        |    44 -
 core/sql/sqlci/UtilMsg.cpp                      |    69 -
 core/sql/sqlci/UtilMsg.h                        |    45 -
 core/sql/sqlci/immudefs.cpp                     |   156 -
 core/sql/sqlci/immudefs.h                       |   185 -
 core/sql/sqlci/sqlci_lex.ll                     |   154 +-
 core/sql/sqlci/sqlci_yacc.y                     |   448 +-
 core/sql/sqlci/sqlclicmd.h                      |     4 -
 core/sql/sqlci/sqlcmd.h                         |    32 +-
 core/sql/sqlcomp/CmpDDLCatErrorCodes.h          |   368 +-
 core/sql/sqlcomp/CmpDescribe.cpp                |   517 +-
 core/sql/sqlcomp/CmpDescribe.h                  |    60 +-
 core/sql/sqlcomp/CmpMain.cpp                    |    79 +-
 core/sql/sqlcomp/CmpMain.h                      |     6 +-
 core/sql/sqlcomp/CmpSeabaseDDL.h                |    73 +-
 core/sql/sqlcomp/CmpSeabaseDDLauth.cpp          |   698 +-
 core/sql/sqlcomp/CmpSeabaseDDLauth.h            |    24 +-
 core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp       |   250 +-
 core/sql/sqlcomp/CmpSeabaseDDLcleanup.h         |     5 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommentOn.cpp     |   380 +
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |  1036 +-
 core/sql/sqlcomp/CmpSeabaseDDLincludes.h        |     1 +
 core/sql/sqlcomp/CmpSeabaseDDLindex.cpp         |    26 +-
 core/sql/sqlcomp/CmpSeabaseDDLinitraf.cpp       |   844 +
 core/sql/sqlcomp/CmpSeabaseDDLmd.h              |   193 +-
 core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp         |     2 +-
 core/sql/sqlcomp/CmpSeabaseDDLrepos.h           |    48 +-
 core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp       |   219 +-
 core/sql/sqlcomp/CmpSeabaseDDLroutine.h         |   101 +-
 core/sql/sqlcomp/CmpSeabaseDDLschema.cpp        |    97 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |  1851 ++-
 core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp       |    28 +-
 core/sql/sqlcomp/CmpSeabaseDDLupgrade.h         |     2 +-
 core/sql/sqlcomp/CmpSeabaseDDLutil.cpp          |     6 +
 core/sql/sqlcomp/CmpSeabaseDDLview.cpp          |    68 +-
 core/sql/sqlcomp/DefaultConstants.h             |   720 +-
 core/sql/sqlcomp/DefaultValidator.cpp           |     8 -
 core/sql/sqlcomp/DefaultValidator.h             |     8 +
 core/sql/sqlcomp/NADefaults.h                   |     4 -
 core/sql/sqlcomp/NewDel.cpp                     |    10 -
 core/sql/sqlcomp/PrivMgr.cpp                    |    14 +-
 core/sql/sqlcomp/PrivMgr.h                      |     4 +
 core/sql/sqlcomp/PrivMgrCommands.cpp            |   162 +-
 core/sql/sqlcomp/PrivMgrCommands.h              |   362 +-
 core/sql/sqlcomp/PrivMgrComponentDefs.h         |   284 +
 core/sql/sqlcomp/PrivMgrComponentOperations.cpp |     6 +-
 core/sql/sqlcomp/PrivMgrComponentPrivileges.cpp |   264 +-
 core/sql/sqlcomp/PrivMgrComponentPrivileges.h   |     6 +-
 core/sql/sqlcomp/PrivMgrDefs.h                  |     3 +-
 core/sql/sqlcomp/PrivMgrMD.cpp                  |    32 +-
 core/sql/sqlcomp/PrivMgrMDTable.cpp             |    14 +-
 core/sql/sqlcomp/PrivMgrObjects.cpp             |     2 +-
 core/sql/sqlcomp/PrivMgrPrivileges.cpp          |   156 +-
 core/sql/sqlcomp/PrivMgrPrivileges.h            |     7 +
 core/sql/sqlcomp/PrivMgrRoles.cpp               |    38 +-
 core/sql/sqlcomp/PrivMgrUserPrivs.cpp           |   208 +
 core/sql/sqlcomp/PrivMgrUserPrivs.h             |   400 +
 core/sql/sqlcomp/QCache.cpp                     |    58 +-
 core/sql/sqlcomp/QCache.h                       |    11 -
 core/sql/sqlcomp/nadefaults.cpp                 |   859 +-
 core/sql/sqlcomp/parser.cpp                     |   157 +-
 core/sql/sqlcomp/parser.h                       |   105 +
 core/sql/sqlcomp/vers_libsqlcomp.cpp            |     2 -
 core/sql/sqlmsg/ComDiagsMsg.cpp                 |    18 +-
 core/sql/sqlmsg/ErrorMessage.cpp                |    12 -
 core/sql/sqlmsg/ErrorMessage.h                  |     2 -
 core/sql/sqlmsg/GetErrorMessage.cpp             |    18 +-
 core/sql/sqlmsg/GetErrorMessage.h               |    22 +-
 core/sql/sqlmsg/ParserMsg.cpp                   |     6 -
 core/sql/sqlmxevents/logmxevent_sq.cpp          |     7 -
 core/sql/sqlmxevents/logmxevent_sq.h            |     2 -
 core/sql/sqlshare/CatSQLShare.cpp               |     2 -
 core/sql/sqlshare/catapirequest.cpp             |  1070 --
 core/sql/sqlshare/catapirequest.h               |   594 -
 core/sql/sqludr/SqlUdrPredefSeries.cpp          |   112 +
 .../java/org/trafodion/sql/HBaseClient.java     |   314 +-
 .../main/java/org/trafodion/sql/HDFSClient.java |   786 +
 .../java/org/trafodion/sql/HTableClient.java    |    66 +-
 .../main/java/org/trafodion/sql/HdfsScan.java   |   345 +
 .../main/java/org/trafodion/sql/HiveClient.java |   181 +-
 .../org/trafodion/sql/SequenceFileWriter.java   |   154 -
 .../org/trafodion/sql/TrafConfiguration.java    |     1 +
 .../java/org/trafodion/sql/TrafRegionStats.java |    13 +-
 .../org/trafodion/sql/udr/LmClassLoader.java    |    54 +-
 .../java/org/trafodion/sql/udr/LmT2Driver.java  |    16 +-
 .../java/org/trafodion/sql/udr/LmUtility.java   |    26 +-
 .../java/org/trafodion/sql/udr/TypeInfo.java    |    18 +-
 .../org/trafodion/sql/udr/predef/JDBCUDR.java   |    43 +-
 core/sql/udrserv/UdrAbortCallBack.cpp           |     2 -
 core/sql/udrserv/UdrDebug.cpp                   |     2 -
 core/sql/udrserv/UdrFFDC.cpp                    |     2 -
 core/sql/udrserv/UdrImplLmExtFunc.cpp           |     2 -
 core/sql/udrserv/UdrRSProcess.cpp               |     8 -
 core/sql/udrserv/UdrResultSet.cpp               |    28 +-
 core/sql/udrserv/UdrStreams.cpp                 |     4 -
 core/sql/udrserv/spinfo.cpp                     |    22 +-
 core/sql/udrserv/spinfoCallback.cpp             |     6 -
 core/sql/udrserv/udrdefs.h                      |    39 +-
 core/sql/udrserv/udrglobals.cpp                 |     9 +-
 core/sql/udrserv/udrload.cpp                    |     6 +-
 core/sql/udrserv/udrserv.cpp                    |    38 +-
 core/sql/udrserv/udrunload.cpp                  |     8 +-
 core/sql/udrserv/udrutil.cpp                    |     8 +-
 core/sql/udrserv/udrutil.h                      |     4 +-
 core/sql/ustat/hs_cli.cpp                       |   135 +-
 core/sql/ustat/hs_cli.h                         |     4 -
 core/sql/ustat/hs_faststats.h                   |     6 +-
 core/sql/ustat/hs_globals.cpp                   |   276 +-
 core/sql/ustat/hs_globals.h                     |     6 +
 core/sql/ustat/hs_la.cpp                        |    54 +-
 core/sql/ustat/hs_lex.ll                        |    11 +-
 core/sql/ustat/hs_log.cpp                       |   269 +-
 core/sql/ustat/hs_log.h                         |    26 +-
 core/sql/ustat/hs_parser.cpp                    |    21 -
 core/sql/ustat/hs_read.cpp                      |   306 +-
 core/sql/ustat/hs_update.cpp                    |    84 +-
 core/sql/ustat/hs_util.cpp                      |    16 +-
 core/sql/ustat/hs_util.h                        |     4 -
 core/sql/ustat/hs_yacc.y                        |    22 +-
 core/sql/ustat/vers_libustat.cpp                |     2 -
 dcs/bin/dcs-config.sh                           |    14 +-
 dcs/bin/dcs-daemon.sh                           |    50 +-
 dcs/bin/getActiveMaster.sh                      |    80 +
 dcs/bin/master-backup.sh                        |    36 +-
 dcs/bin/scripts/dcsbind.sh                      |    64 +-
 dcs/bin/scripts/dcsunbind.sh                    |    43 +-
 dcs/bin/scripts/parse_dcs_site.py               |    18 +-
 dcs/bin/start-dcs.sh                            |     9 +-
 dcs/bin/stop-dcs.sh                             |    16 +-
 dcs/conf/backup-masters                         |     0
 dcs/conf/dcs-env.sh                             |     4 +
 dcs/conf/master                                 |     0
 dcs/conf/masters                                |     0
 dcs/pom.xml                                     |    10 +
 .../main/asciidoc/_chapters/configuration.adoc  |   220 +-
 .../main/java/org/trafodion/dcs/Constants.java  |    44 +-
 .../org/trafodion/dcs/master/ServerManager.java |    92 +-
 .../dcs/master/listener/ListenerWorker.java     |    65 +-
 .../dcs/master/listener/RequestCancelQuery.java |    10 +-
 .../master/listener/RequestGetObjectRef.java    |     8 +-
 .../dcs/master/listener/RequestUnknown.java     |     6 +-
 .../org/trafodion/dcs/server/ServerManager.java |   170 +-
 .../trafodion/dcs/servermt/ServerConstants.java |     2 +-
 .../org/trafodion/dcs/util/RetryCounter.java    |   114 +-
 .../trafodion/dcs/util/RetryCounterFactory.java |     4 +
 dcs/src/main/resources/dcs-default.xml          |    53 +
 .../trafodion/dcs/IntegrationTestEndurance.java |     4 +-
 .../java/org/trafodion/jdbc_test/PropTest.java  |     8 +
 .../java/org/trafodion/jdbc_test/TestAbort.java |    60 +
 .../java/org/trafodion/jdbc_test/TestCat.java   |    77 +-
 .../org/trafodion/jdbc_test/TestClientInfo.java |   146 +
 .../org/trafodion/jdbc_test/TestGetColumns.java |   260 +
 .../trafodion/jdbc_test/TestGetIndexInfo.java   |     2 +-
 .../trafodion/jdbc_test/TestNetworkTimeout.java |    91 +
 .../java/org/trafodion/jdbc_test/TestWrap.java  |   109 +
 dcs/src/test/pytests/README.rst                 |     4 +-
 doap.rdf                                        |    51 +
 .../src/asciidoc/_chapters/odbc_windows.adoc    |    18 +-
 .../src/asciidoc/_chapters/preparation.adoc     |     2 +
 .../src/asciidoc/_chapters/commands.adoc        |     2 +-
 .../src/asciidoc/_chapters/launch.adoc          |     2 +-
 .../src/asciidoc/_chapters/accessing.adoc       |    35 +-
 .../src/asciidoc/_chapters/introduction.adoc    |     2 +-
 .../src/asciidoc/_chapters/lob_data.adoc        |     2 +-
 .../src/asciidoc/_chapters/lob_management.adoc  |     6 +-
 .../src/asciidoc/_chapters/messages.adoc        |    18 +-
 .../asciidoc/_chapters/properties_detail.adoc   |    10 +-
 .../src/resources/source/blob_example.java      |    12 +-
 .../src/resources/source/clob_example.java      |    12 +-
 docs/lob_guide/pom.xml                          |   299 +
 .../lob_guide/src/asciidoc/_chapters/about.adoc |   195 +
 .../src/asciidoc/_chapters/introduction.adoc    |   152 +
 .../asciidoc/_chapters/working_with_lob.adoc    |  1203 ++
 docs/lob_guide/src/asciidoc/index.adoc          |    53 +
 .../src/asciidoc/_chapters/binder_msgs.adoc     |    85 +-
 .../src/asciidoc/_chapters/compiler_msgs.adoc   |     6 +-
 .../src/asciidoc/_chapters/ddl_msgs.adoc        |  2201 ++-
 .../src/asciidoc/_chapters/executor_msgs.adoc   |    13 +
 .../src/asciidoc/_chapters/parser_msgs.adoc     |    43 +-
 .../asciidoc/_chapters/update_stats_msgs.adoc   |     4 +-
 docs/odb_user/src/asciidoc/_chapters/load.adoc  |    76 +-
 .../src/asciidoc/_chapters/ambari_install.adoc  |     4 +-
 .../src/asciidoc/_chapters/introduction.adoc    |    10 +-
 .../src/asciidoc/_chapters/requirements.adoc    |    37 +-
 .../src/asciidoc/_chapters/execute_spjs.adoc    |     2 +-
 .../src/asciidoc/_chapters/get_started.adoc     |     2 +-
 .../src/asciidoc/_chapters/introduction.adoc    |   117 +-
 .../src/asciidoc/_chapters/olap_functions.adoc  |     4 +-
 .../sql_functions_and_expressions.adoc          |  1941 ++-
 .../_chapters/sql_language_elements.adoc        |    82 +-
 .../src/asciidoc/_chapters/sql_statements.adoc  |  1873 ++-
 .../src/asciidoc/_chapters/sql_utilities.adoc   |   976 +-
 .../images/grouping-by-three-rollup-columns.jpg |   Bin 0 -> 135453 bytes
 docs/src/site/markdown/architecture-overview.md |     4 +-
 docs/src/site/markdown/documentation.md         |    22 +
 docs/src/site/markdown/download.md              |   146 +-
 docs/src/site/markdown/index.md                 |    12 +-
 docs/src/site/markdown/release-notes-2-2-0.md   |   539 +
 docs/src/site/markdown/release-notes.md         |     1 +
 docs/src/site/site.xml                          |    14 +-
 .../TRAFODION/2.1/configuration/dcs-env.xml     |     7 +-
 .../2.1/package/scripts/trafodionnode.py        |    13 +-
 install/python-installer/configs/version.json   |     4 +-
 install/python-installer/scripts/dcs_setup.py   |     9 +-
 install/python-installer/scripts/traf_ldap.py   |     2 +-
 install/python-installer/scripts/traf_start.py  |     8 +
 install/traf_checkset_env.sh                    |   311 +
 install/traf_tools_setup.sh                     |    28 +
 pom.xml                                         |     7 +-
 win-odbc64/Common/ExpConvMxcs.cpp               |     4 +-
 win-odbc64/Common/TransportBase.h               |     2 +
 win-odbc64/Common/marshalingdrvr_drvr.cpp       |   123 +
 win-odbc64/Common/marshalingdrvr_drvr.h         |    27 +
 win-odbc64/Install/win32_installer/LICENSE.rtf  |   155 +
 .../Install/win32_installer/installer.iss       |   221 +
 .../Install/win64_installer/installer.iss       |    64 +-
 win-odbc64/Krypton/generated_incs/odbc_cl.h     |    52 +
 .../odbcclient/Drvr35Res/Drvr35Res_os.vcxproj   |    99 +-
 win-odbc64/odbcclient/README.txt                |    11 +-
 .../TranslationDll/TranslationDll_os.vcxproj    |   129 +-
 win-odbc64/odbcclient/build_os_32.bat           |   173 +
 .../odbcclient/drvr35/Interface/odbcs_drvr.cpp  |   227 +
 .../odbcclient/drvr35/Interface/odbcs_drvr.h    |    24 +
 .../drvr35/TCPIPV4/TCPIPV4_os.vcxproj           |   104 +-
 .../drvr35/TCPIPV6/TCPIPV6_os.vcxproj           |    98 +-
 win-odbc64/odbcclient/drvr35/cconnect.cpp       |     6 +-
 win-odbc64/odbcclient/drvr35/cconnect.h         |     4 +
 win-odbc64/odbcclient/drvr35/cdesc.cpp          |    27 +-
 win-odbc64/odbcclient/drvr35/charsetconv.cpp    |    84 +-
 win-odbc64/odbcclient/drvr35/cstmt.cpp          |   309 +
 win-odbc64/odbcclient/drvr35/cstmt.h            |    27 +
 win-odbc64/odbcclient/drvr35/ctosqlconv.cpp     |    28 +-
 win-odbc64/odbcclient/drvr35/diagfunctions.cpp  |     7 +-
 win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj  |   138 +-
 .../odbcclient/drvr35/drvr35_os.vcxproj.filters |     6 +
 .../odbcclient/drvr35/drvr35_os.vcxproj.user    |    16 +
 win-odbc64/odbcclient/drvr35/drvrglobal.cpp     |   114 +-
 win-odbc64/odbcclient/drvr35/drvrglobal.h       |     2 +
 win-odbc64/odbcclient/drvr35/drvrnet.cpp        |    12 +
 win-odbc64/odbcclient/drvr35/drvrnet.h          |    21 +
 win-odbc64/odbcclient/drvr35/lob.cpp            |    88 +
 win-odbc64/odbcclient/drvr35/lob.h              |    38 +
 win-odbc64/odbcclient/drvr35/netstmt.cpp        |    95 +
 win-odbc64/odbcclient/drvr35/sqltocconv.cpp     |   163 +-
 win-odbc64/odbcclient/drvr35/sqltocconv.h       |     4 +-
 .../odbcclient/drvr35adm/Drvr35Adm_os.vcxproj   |   130 +-
 .../drvr35adm/Drvr35Adm_os.vcxproj.user         |     7 +
 .../odbcclient/drvr35msg/Drvr35Msg_os.vcxproj   |    75 +-
 win-odbc64/odbcclient/odbcclient_os.sln         |    40 +-
 win-odbc64/sql/cli/sqlcli.h                     |     4 +
 win-odbc64/sql/common/csconvert.cpp             |     2 +-
 1883 files changed, 128708 insertions(+), 102912 deletions(-)
----------------------------------------------------------------------


Reply via email to