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

[12/14] incubator-trafodion git commit: lcov: commit #1

lcov: commit #1


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

Branch: refs/heads/master
Commit: 7a95e1da4f70eb3e29478e1126b7ebfcfb60b91a
Parents: dc0d204
Author: Anoop Sharma <an...@esgyn.com>
Authored: Wed Sep 20 14:41:28 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Wed Sep 20 14:41:28 2017 +0000

----------------------------------------------------------------------
 core/sql/arkcmp/vers_libarkcmp.cpp              |   2 -
 core/sql/bin/ex_esp_main.cpp                    |   4 -
 core/sql/bin/ex_ssmp_main.cpp                   |   2 -
 core/sql/cli/Cli.cpp                            | 145 +------------------
 core/sql/cli/Cli.h                              |   2 -
 core/sql/cli/CliExpExchange.cpp                 |  10 --
 core/sql/cli/CliExtern.cpp                      |  85 -----------
 core/sql/cli/CliImplLmExtFunc.cpp               |   2 -
 core/sql/cli/ExSqlComp.cpp                      |  24 +--
 core/sql/cli/Globals.cpp                        |  17 ---
 core/sql/cli/Globals.h                          |  12 +-
 core/sql/comexe/ComKeyRange.cpp                 |   2 -
 core/sql/comexe/ComPackDefs.h                   |   2 -
 core/sql/comexe/ComTdb.cpp                      |   5 -
 core/sql/comexe/ComTdb.h                        |  10 +-
 core/sql/comexe/ComTdbCompoundStmt.cpp          |   2 -
 core/sql/comexe/ComTdbCompoundStmt.h            |   4 -
 core/sql/comexe/ComTdbControl.h                 |   2 -
 core/sql/comexe/ComTdbExeUtil.cpp               |   2 -
 core/sql/comexe/ComTdbExplain.cpp               |   2 -
 core/sql/comexe/ComTdbMj.cpp                    |   4 +-
 core/sql/comexe/ComTdbSendBottom.cpp            |   6 -
 core/sql/comexe/ComTdbSendBottom.h              |   2 -
 core/sql/comexe/ComTdbSendTop.cpp               |   6 -
 core/sql/comexe/ComTdbSendTop.h                 |   2 +-
 core/sql/comexe/ComTdbSequence.cpp              |   4 -
 core/sql/comexe/ComTdbSplitBottom.cpp           |   4 -
 core/sql/comexe/ComTdbSplitBottom.h             |   2 -
 core/sql/comexe/ComTdbSplitTop.cpp              |   4 -
 core/sql/comexe/ComTdbSplitTop.h                |   4 -
 core/sql/comexe/ComTdbTranspose.h               |   2 -
 core/sql/comexe/ComTdbTuple.cpp                 |   2 -
 core/sql/comexe/ComTdbTuple.h                   |   4 -
 core/sql/comexe/ComTdbUnPackRows.cpp            |   4 -
 core/sql/comexe/ComTdbUnPackRows.h              |   2 -
 core/sql/comexe/ComTdbUnion.cpp                 |   4 -
 core/sql/comexe/ComTdbUnion.h                   |   4 -
 core/sql/comexe/LateBindInfo.cpp                |   3 -
 core/sql/common/BaseTypes.cpp                   |   6 +-
 core/sql/common/CharType.cpp                    |  24 +--
 core/sql/common/ComMvAttributeBitmap.cpp        |  10 --
 core/sql/common/ComMvAttributeBitmap.h          |   2 -
 core/sql/common/ComSpace.cpp                    |   4 -
 core/sql/common/DateTimeType.cpp                |  10 --
 core/sql/common/ExprNode.cpp                    |   2 -
 core/sql/common/Ipc.cpp                         |  42 +-----
 core/sql/common/Ipc.h                           |   2 -
 core/sql/common/IpcGuardian.cpp                 |   1 -
 core/sql/common/NAMemory.h                      |   4 -
 core/sql/common/NAString.cpp                    |  10 +-
 core/sql/common/NAString2.cpp                   |   2 -
 core/sql/common/NAType.cpp                      |   6 -
 core/sql/common/Timer.h                         |   2 -
 core/sql/common/charinfo.cpp                    |  14 --
 core/sql/common/charinfo.h                      |   2 -
 core/sql/common/conversionSJIS.cpp              |   2 -
 core/sql/common/dfs2rec.h                       |   2 -
 core/sql/common/nawstring.cpp                   |   6 -
 core/sql/common/nchar_mp.h                      |   4 -
 core/sql/common/str.cpp                         |  10 +-
 core/sql/common/wstr.cpp                        |   4 -
 core/sql/executor/Allocator.h                   |   4 -
 core/sql/executor/CliMsgObj.cpp                 |   2 -
 core/sql/executor/ExComTdb.cpp                  |   8 +-
 core/sql/executor/ExExeUtilGet.cpp              |   3 -
 core/sql/executor/ExSequence.cpp                |  54 -------
 core/sql/executor/ExVPJoin.cpp                  |   2 -
 core/sql/executor/ExVPJoin.h                    |   2 -
 core/sql/executor/HdfsLogger.h                  |   2 -
 core/sql/executor/MdamRefList.cpp               |   4 -
 core/sql/executor/MdamRefList.h                 |   4 -
 core/sql/executor/cluster.cpp                   |   4 +-
 core/sql/executor/cluster.h                     |   2 +-
 core/sql/executor/ex_ex.h                       |   2 +-
 core/sql/executor/ex_hash_grby.cpp              |  29 ++--
 core/sql/executor/ex_hash_grby.h                |   6 +-
 core/sql/executor/ex_mdam.cpp                   |   8 +-
 core/sql/executor/ex_queue.cpp                  |   2 -
 core/sql/executor/ex_root.cpp                   |  10 --
 core/sql/executor/ex_sort.cpp                   | 116 ---------------
 core/sql/executor/ex_split_bottom.cpp           |   2 -
 core/sql/executor/ex_tcb_private.cpp            |   2 -
 core/sql/executor/ex_timeout.cpp                |   2 -
 core/sql/executor/ex_timeout.h                  |   4 +-
 core/sql/executor/ex_transaction.cpp            |  15 +-
 core/sql/executor/ex_transaction.h              |   4 +-
 core/sql/executor/ex_tuple.cpp                  |   6 -
 core/sql/executor/ex_tuple.h                    |  10 +-
 core/sql/executor/ex_tuple_flow.cpp             |  22 +--
 core/sql/executor/key_range.h                   |   4 +-
 core/sql/executor/timeout_data.h                |   6 +-
 core/sql/exp/ExpLOBprocess.cpp                  |   8 +-
 core/sql/exp/ExpPCode.cpp                       |  18 ---
 core/sql/exp/ExpPCodeOptimizations.cpp          |   2 -
 core/sql/exp/ExpSequenceFunction.cpp            |  20 ---
 core/sql/exp/ExpSqlTupp.cpp                     |   2 -
 core/sql/exp/exp_aggregate.cpp                  |   4 -
 core/sql/exp/exp_arith.cpp                      |  26 ----
 core/sql/exp/exp_bignum.cpp                     |  16 --
 core/sql/exp/exp_clause.cpp                     |  36 -----
 core/sql/exp/exp_comp.cpp                       |  48 ------
 core/sql/exp/exp_conv.cpp                       | 144 +-----------------
 core/sql/exp/exp_datetime.cpp                   |  12 --
 core/sql/exp/exp_expr.cpp                       |   6 -
 core/sql/exp/exp_function.cpp                   |  27 ----
 core/sql/exp/exp_like.cpp                       |  35 +----
 core/sql/exp/exp_math_func.cpp                  |  11 --
 core/sql/exp/exp_misc.cpp                       |   2 -
 core/sql/export/ComDiags.cpp                    |   1 -
 core/sql/generator/GenPreCode.cpp               |  20 ---
 core/sql/generator/vers_libgenerator.cpp        |   2 -
 core/sql/langman/LmAssert.cpp                   |   2 -
 core/sql/langman/LmComQueue.cpp                 |   4 -
 core/sql/langman/LmContManager.cpp              |   4 -
 core/sql/langman/LmDebug.cpp                    |  12 +-
 core/sql/langman/LmJavaExceptionReporter.cpp    |   6 -
 core/sql/langman/LmJavaHooks.cpp                |   2 -
 core/sql/langman/LmLangManager.cpp              |   2 -
 core/sql/langman/LmResultSetJava.cpp            |   2 -
 core/sql/langman/LmUtility.cpp                  |   8 -
 core/sql/langman/vers_libtdm_sqllangman.cpp     |   2 -
 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             |   8 +-
 core/sql/optimizer/BindRI.cpp                   |   2 -
 core/sql/optimizer/BindRelExpr.cpp              |  24 ---
 core/sql/optimizer/BindWA.cpp                   |   8 -
 core/sql/optimizer/ChangesTable.cpp             |  16 +-
 core/sql/optimizer/ChangesTable.h               |  14 +-
 core/sql/optimizer/ClusteredBitmap.cpp          |   4 -
 core/sql/optimizer/CmpProcess.cpp               |   2 -
 core/sql/optimizer/ColStatDesc.cpp              |  60 +-------
 core/sql/optimizer/ColStatDesc.h                |   2 -
 core/sql/optimizer/ColumnDesc.cpp               |   2 -
 core/sql/optimizer/ColumnDesc.h                 |   2 -
 core/sql/optimizer/ColumnNameMap.h              |   2 -
 core/sql/optimizer/ControlDB.cpp                |   2 -
 core/sql/optimizer/Cost.cpp                     |  30 ----
 core/sql/optimizer/EncodedValue.cpp             |   4 -
 core/sql/optimizer/EstLogProp.cpp               |   4 -
 core/sql/optimizer/EstLogProp.h                 |   4 +-
 core/sql/optimizer/GroupAttr.cpp                |  10 +-
 core/sql/optimizer/ImplRule.cpp                 |  74 +++++-----
 core/sql/optimizer/Inlining.cpp                 |   8 -
 core/sql/optimizer/Inlining.h                   |   6 +-
 core/sql/optimizer/ItemArith.h                  |   2 +-
 core/sql/optimizer/ItemColRef.h                 |  14 +-
 core/sql/optimizer/ItemConstr.h                 |   2 +-
 core/sql/optimizer/ItemExpr.cpp                 |  26 +---
 core/sql/optimizer/ItemExpr.h                   |   8 +-
 core/sql/optimizer/ItmBitMuxFunction.cpp        |   2 -
 core/sql/optimizer/ItmBitMuxFunction.h          |   2 -
 core/sql/optimizer/ItmFlowControlFunction.cpp   |   6 -
 core/sql/optimizer/LargeScopeRules.cpp          |  38 -----
 core/sql/optimizer/MVCandidates.cpp             |  38 ++---
 core/sql/optimizer/MVCandidates.h               |   2 -
 core/sql/optimizer/MVInfo.cpp                   |  18 ---
 core/sql/optimizer/MjvBuilder.cpp               |   6 -
 core/sql/optimizer/MultiJoin.cpp                |  18 +--
 core/sql/optimizer/MultiJoin.h                  |   4 -
 core/sql/optimizer/MvLog.cpp                    |   2 -
 core/sql/optimizer/MvLog.h                      |   2 -
 core/sql/optimizer/MvMultiTxnMavBuilder.cpp     |  14 --
 core/sql/optimizer/MvRefreshBuilder.cpp         |  32 ----
 core/sql/optimizer/MvRefreshBuilder.h           |   2 -
 core/sql/optimizer/NAClusterInfo.cpp            |   8 -
 core/sql/optimizer/NAClusterInfo.h              |   2 -
 core/sql/optimizer/NAColumn.cpp                 |   8 -
 core/sql/optimizer/NATable.cpp                  |  10 --
 core/sql/optimizer/NATable.h                    |   6 -
 core/sql/optimizer/NodeMap.cpp                  |  12 --
 core/sql/optimizer/NormRelExpr.cpp              |   1 -
 core/sql/optimizer/ObjectNames.cpp              |   4 -
 core/sql/optimizer/OptRange.cpp                 |  30 ++--
 core/sql/optimizer/OptTrigger.cpp               |  10 +-
 core/sql/optimizer/OptTrigger.h                 |   8 +-
 core/sql/optimizer/PackedColDesc.cpp            |   2 -
 core/sql/optimizer/PackedColDesc.h              |   2 -
 core/sql/optimizer/PartFunc.cpp                 |  38 -----
 core/sql/optimizer/PartFunc.h                   |   2 -
 core/sql/optimizer/PartReq.cpp                  |  26 ----
 core/sql/optimizer/PartReq.h                    |   6 -
 core/sql/optimizer/PhyProp.cpp                  |   6 -
 core/sql/optimizer/PhyProp.h                    |   8 +-
 core/sql/optimizer/QRDescGenerator.cpp          |  16 +-
 core/sql/optimizer/QueryGraph.cpp               |   2 -
 core/sql/optimizer/QueryRewriteHandler.cpp      |  18 +--
 core/sql/optimizer/QueryRewriteHandler.h        |   2 +-
 core/sql/optimizer/Refresh.cpp                  |   2 -
 core/sql/optimizer/Rule.cpp                     |  14 --
 core/sql/optimizer/Rule.h                       |   8 -
 core/sql/optimizer/ScanOptimizer.cpp            |  66 +--------
 core/sql/optimizer/SearchKey.cpp                |  10 +-
 core/sql/optimizer/Stats.cpp                    |  92 +-----------
 core/sql/optimizer/Stats.h                      |   4 -
 core/sql/optimizer/SynthType.cpp                |  28 +---
 core/sql/optimizer/TableDesc.cpp                |   8 +-
 core/sql/optimizer/TableDesc.h                  |   4 -
 core/sql/optimizer/TransRule.cpp                |   4 +-
 core/sql/optimizer/TransRule.h                  |  42 +++---
 core/sql/optimizer/TriggerDB.cpp                |  16 --
 core/sql/optimizer/Triggers.cpp                 |  18 ---
 core/sql/optimizer/Triggers.h                   |  15 +-
 core/sql/optimizer/ValueDesc.cpp                |   2 +-
 core/sql/optimizer/costmethod.cpp               |  58 +-------
 core/sql/optimizer/disjunct.h                   |   2 -
 core/sql/optimizer/mdam.cpp                     |  28 +---
 core/sql/optimizer/memo.cpp                     |  12 +-
 core/sql/optimizer/opt.cpp                      |  16 --
 core/sql/optimizer/tasks.cpp                    |  22 ---
 core/sql/optimizer/vers_liboptimizer.cpp        |   2 -
 core/sql/parser/BindStmtDDL.cpp                 |   4 -
 .../ElemDDLCreateMVOneAttributeTableList.cpp    |   2 -
 .../ElemDDLCreateMVOneAttributeTableList.h      |   2 -
 core/sql/parser/ElemDDLLobAttrs.h               |   2 -
 core/sql/parser/ElemDDLLoggable.h               |   1 -
 core/sql/parser/ElemDDLTableFeature.h           |   1 -
 core/sql/parser/StmtDDLAlterMV.h                |   4 -
 core/sql/parser/StmtDDLCreate.cpp               |   2 -
 .../parser/StmtDDLCreateComponentPrivilege.h    |   2 -
 core/sql/parser/StmtDDLCreateMV.h               |   8 -
 core/sql/parser/StmtDDLCreateTrigger.h          |   2 -
 core/sql/parser/StmtDDLDrop.cpp                 |   2 -
 core/sql/parser/StmtDDLDropComponentPrivilege.h |   2 -
 core/sql/parser/StmtDDLDropMV.h                 |   2 -
 .../sql/parser/StmtDDLGrantComponentPrivilege.h |   2 -
 core/sql/parser/StmtDDLNode.cpp                 |   8 -
 .../parser/StmtDDLRevokeComponentPrivilege.h    |   2 -
 core/sql/parser/sqlparser.y                     |   6 +-
 core/sql/parser/vers_libparser.cpp              |   2 -
 core/sql/qms/QRDescriptorStubs.cpp              |   2 -
 core/sql/qms/QmpMain.cpp                        |  10 --
 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                      |  10 --
 core/sql/qms/QmsMain.cpp                        |   2 -
 core/sql/qms/QmsQms.cpp                         |  14 --
 core/sql/qms/QmsRequest.cpp                     |  22 +--
 core/sql/qms/QmsRequest.h                       |   4 +-
 core/sql/qms/QmsSelfJoinHandler.cpp             |   6 -
 core/sql/qms/QmsStubs.cpp                       |   2 -
 core/sql/qmscommon/QRDescriptor.cpp             | 118 +++++++--------
 core/sql/qmscommon/QRDescriptor.h               |  52 +------
 core/sql/qmscommon/QRLogger.cpp                 |   8 +-
 core/sql/qmscommon/QRLogger.h                   |   2 -
 core/sql/qmscommon/QRQueries.h                  |   2 -
 core/sql/qmscommon/QRQueriesImpl.cpp            |  16 +-
 core/sql/qmscommon/QueryRewriteServer.cpp       |  44 +-----
 core/sql/qmscommon/Range.cpp                    |  20 ---
 core/sql/qmscommon/XMLUtil.h                    |  14 +-
 core/sql/qmscommon/vers_libqmscommon.cpp        |   2 -
 core/sql/refresh/RuAuditRefreshTaskExecutor.h   |   2 -
 core/sql/refresh/RuDeltaDef.cpp                 |  10 --
 core/sql/refresh/RuDupElimGlobals.cpp           |   4 -
 core/sql/refresh/RuDupElimLogScanner.h          |   2 -
 core/sql/refresh/RuDupElimTaskExecutor.cpp      |  10 --
 core/sql/refresh/RuEmpCheckTaskExecutor.cpp     |   8 -
 core/sql/refresh/RuEmpCheckTaskExecutor.h       |   2 -
 core/sql/refresh/RuException.cpp                |   8 -
 core/sql/refresh/RuExecController.cpp           |   8 -
 core/sql/refresh/RuForceOptions.cpp             |   2 -
 core/sql/refresh/RuForceOptions.h               |   4 -
 core/sql/refresh/RuForceOptionsParser.cpp       |   2 -
 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                  |   6 -
 core/sql/refresh/RuRcReleaseTaskExecutor.h      |   2 -
 core/sql/refresh/RuRefreshSQLComposer.cpp       |  14 --
 core/sql/refresh/RuRefreshTaskExecutor.cpp      |  24 ---
 core/sql/refresh/RuSQLStatementContainer.cpp    |   8 -
 .../sql/refresh/RuSimpleRefreshTaskExecutor.cpp |  12 --
 core/sql/refresh/RuTableSyncTaskExecutor.h      |   2 -
 core/sql/refresh/RuTask.cpp                     |   6 -
 core/sql/refresh/RuTaskExecutor.cpp             |  10 --
 core/sql/refresh/RuTaskExecutor.h               |   2 -
 core/sql/refresh/RuTaskServerExecControler.cpp  |   2 -
 core/sql/refresh/RuTbl.cpp                      |   2 -
 core/sql/refresh/RuTestTaskExecutor.cpp         |   2 -
 core/sql/refresh/RuTestTaskExecutor.h           |   2 -
 core/sql/refresh/RuUnAuditRefreshTaskExecutor.h |   2 -
 core/sql/runtimestats/RtsStubs.cpp              |   2 -
 core/sql/runtimestats/sscpipc.cpp               |   2 -
 core/sql/smdio/vers_libsmdio.cpp                |   2 -
 core/sql/sort/DiskPool_sq.h                     |   2 -
 core/sql/sort/ScratchFileConnection.h           |   2 -
 core/sql/sort/SortUtil.cpp                      |  15 --
 core/sql/sort/Statistics.cpp                    |   2 -
 core/sql/sort/TourTree.cpp                      |   2 -
 core/sql/sort/scratchfileconnection.cpp         |   2 -
 core/sql/sort/vers_libsort.cpp                  |   2 -
 core/sql/sqlcomp/CmpDescribe.cpp                |   2 -
 core/sql/sqlcomp/CmpMain.cpp                    |   6 +-
 core/sql/sqlcomp/CmpMain.h                      |   6 +-
 core/sql/sqlcomp/DefaultValidator.cpp           |   4 -
 core/sql/sqlcomp/NADefaults.h                   |   4 -
 core/sql/sqlcomp/NewDel.cpp                     |   2 -
 core/sql/sqlcomp/QCache.cpp                     |   2 -
 core/sql/sqlcomp/nadefaults.cpp                 |   4 -
 core/sql/sqlcomp/vers_libsqlcomp.cpp            |   2 -
 core/sql/sqlmxevents/logmxevent_sq.cpp          |   7 -
 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               |   6 -
 core/sql/udrserv/spinfo.cpp                     |   2 -
 core/sql/udrserv/spinfoCallback.cpp             |   6 -
 core/sql/udrserv/udrglobals.cpp                 |   2 -
 core/sql/udrserv/udrload.cpp                    |   2 -
 core/sql/udrserv/udrserv.cpp                    |  10 --
 core/sql/udrserv/udrunload.cpp                  |   4 -
 core/sql/udrserv/udrutil.cpp                    |   2 -
 core/sql/ustat/hs_cli.cpp                       |  22 ---
 core/sql/ustat/hs_cli.h                         |   2 -
 core/sql/ustat/hs_globals.cpp                   |  50 +------
 core/sql/ustat/hs_la.cpp                        |  11 +-
 core/sql/ustat/hs_log.cpp                       |   4 +-
 core/sql/ustat/hs_parser.cpp                    |   8 -
 core/sql/ustat/hs_read.cpp                      |  24 +--
 core/sql/ustat/hs_update.cpp                    |   4 -
 core/sql/ustat/hs_util.cpp                      |  12 --
 core/sql/ustat/hs_util.h                        |   4 -
 core/sql/ustat/vers_libustat.cpp                |   2 -
 334 files changed, 316 insertions(+), 3402 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/arkcmp/vers_libarkcmp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/vers_libarkcmp.cpp b/core/sql/arkcmp/vers_libarkcmp.cpp
index 33a30a3..0eeff4d 100644
--- a/core/sql/arkcmp/vers_libarkcmp.cpp
+++ b/core/sql/arkcmp/vers_libarkcmp.cpp
@@ -26,6 +26,4 @@
 #define VERS_CV_MIN 0
 #define VERS_CV_UPD 1
 
-// LCOV_EXCL_START
 VERS_LIB(libarkcmp)
-// LCOV_EXCL_STOP

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/bin/ex_esp_main.cpp
----------------------------------------------------------------------
diff --git a/core/sql/bin/ex_esp_main.cpp b/core/sql/bin/ex_esp_main.cpp
index ae27eec..0a54fb6 100644
--- a/core/sql/bin/ex_esp_main.cpp
+++ b/core/sql/bin/ex_esp_main.cpp
@@ -563,7 +563,6 @@ void EspGuaControlConnection::actOnSystemMessage(
         // Master is gone, stop this process and let the OS cleanup.
         if (getEnv()->getLogEspGotCloseMsg())
         {
-          // LCOV_EXCL_START
           /*
           Coverage notes: to test this code in a dev regression requires
           changing $TRAF_HOME/etc/ms.env, so I made a manual test on
@@ -577,14 +576,12 @@ void EspGuaControlConnection::actOnSystemMessage(
           char *sysMsgName = NULL;
           switch (messageNum)
           {
-          // LCOV_EXCL_STOP
           case ZSYS_VAL_SMSG_CPUDOWN:
             sysMsgName = (char *) "CPUDOWN";
             break;
           case ZSYS_VAL_SMSG_REMOTECPUDOWN:
             sysMsgName = (char *) "REMOTECPUDOWN";
             break;
-          // LCOV_EXCL_START
           case ZSYS_VAL_SMSG_CLOSE:
             sysMsgName = (char *) "CLOSE";
             break;
@@ -597,7 +594,6 @@ void EspGuaControlConnection::actOnSystemMessage(
                             sysMsgName, myName);
           SQLMXLoggingArea::logExecRtInfo(__FILE__, 
                                           __LINE__, buf, 0);
-          // LCOV_EXCL_STOP
         }
         getEnv()->stopIpcEnvironment();
       }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/bin/ex_ssmp_main.cpp
----------------------------------------------------------------------
diff --git a/core/sql/bin/ex_ssmp_main.cpp b/core/sql/bin/ex_ssmp_main.cpp
index 88f876c..2f17b95 100755
--- a/core/sql/bin/ex_ssmp_main.cpp
+++ b/core/sql/bin/ex_ssmp_main.cpp
@@ -182,7 +182,6 @@ void runServer(Int32 argc, char **argv)
   // while holding the stats semaphore.  This code has been covered in
   // a manual unit test, but it is not possible to cover this easily in
   // an automated test.
-  // LCOV_EXCL_START
   if (statsGlobals->getSemPid() != -1)
   {
     NAProcessHandle prevSsmpPhandle((SB_Phandle_Type *)
@@ -206,7 +205,6 @@ void runServer(Int32 argc, char **argv)
                      (pid_t) myPhandle.getPin());
     }
   }
-  // LCOV_EXCL_STOP
 
   XPROCESSHANDLE_GETMINE_(statsGlobals->getSsmpProcHandle());
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index 1fdc61c..fd6935b 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -109,7 +109,6 @@ StrTarget::StrTarget() :
   cnvExternalCharset_(cnv_UnknownCharSet),
   cnvInternalCharset_(cnv_UnknownCharSet)
 {}
-//LCOV_EXCL_START
 StrTarget::StrTarget(Descriptor *desc, Lng32 entry) :
      heap_(NULL),
      str_(NULL),
@@ -120,7 +119,6 @@ StrTarget::StrTarget(Descriptor *desc, Lng32 entry) :
 {
   init(desc, entry);
 }
-//LCOV_EXCL_STOP
 void StrTarget::init(Descriptor *desc, Lng32 entry)
 {
   Lng32 sourceLen, sourceType, externalCharset, internalCharset;
@@ -389,7 +387,6 @@ static Lng32 SQLCLI_Prepare_Setup_Post(
 static Lng32 CheckNOSQLAccessMode(CliGlobals &cliGlobals)
 {
   // rare error condition
-  //LCOV_EXCL_START
   if (!cliGlobals.sqlAccessAllowed())
   {
     cliGlobals.setUdrAccessModeViolation(TRUE);
@@ -401,7 +398,6 @@ static Lng32 CheckNOSQLAccessMode(CliGlobals &cliGlobals)
     }
     return - CLI_NO_SQL_ACCESS_MODE_VIOLATION;
   }
-  //LCOV_EXCL_STOP
   return SUCCESS;
 }
 
@@ -428,24 +424,20 @@ static Lng32 CliPrologue(CliGlobals   * cliGlobals,
       if (exTransaction != NULL)
       {
           retcode =  exTransaction->inheritTransaction();
-          //LCOV_EXCL_START
          if (isERROR(retcode))
          {
             diags << DgSqlCode(- CLI_BEGIN_TRANSACTION_ERROR);
             return ERROR;
          }
-         //LCOV_EXCL_STOP
       }
     }
 
-  //LCOV_EXCL_START - versioning obsolete
   if ((context->getVersionOfCompiler() != COM_VERS_COMPILER_VERSION) && (numOfCliCalls >1 ))
     {
       short index = 0;
       cliGlobals->setSavedVersionOfCompiler(context->getVersionOfCompiler());
       context->setOrStartCompiler(COM_VERS_COMPILER_VERSION,NULL, index);
     }
-  //LCOV_EXCL_STOP
 
   // Initialize session defaults.
   // if session defaults have not been read from the default table,
@@ -479,10 +471,8 @@ static Lng32 CliEpilogue(CliGlobals * cliGlobals,
 
       if (isERROR(retcode))
         {
-	  //LCOV_EXCL_START
           ComDiagsArea & diags = context->diags();
           return diags.mainSQLCODE();
-	  //LCOV_EXCL_STOP
         }
     }
 #if 0
@@ -536,12 +526,10 @@ Lng32 local_SetDescPointers(/*IN*/       Descriptor * desc,
       (starting_entry <= 0) ||
       ((num_ptr_pairs + starting_entry - 1) > desc->getUsedEntryCount()))
     {
-      //LCOV_EXCL_START
       ComDiagsArea & diags = context->diags();
 
       diags << DgSqlCode(-CLI_INTERNAL_ERROR);
       return SQLCLI_ReturnCode(context, -CLI_INTERNAL_ERROR);
-      //LCOV_EXCL_STOP
     }
 
   for (Lng32 entry=starting_entry, i = 0; entry < starting_entry+num_ptr_pairs;
@@ -561,7 +549,7 @@ Lng32 local_SetDescPointers(/*IN*/       Descriptor * desc,
       
      if(ip && (context->boundsCheckMemory(ip, desc->getIndLength(entry))) ||
         (context->boundsCheckMemory(vp, desc->getVarDataLength(entry))))
-       return SQLCLI_ReturnCode(context,-CLI_USER_MEMORY_IN_EXECUTOR_SEGMENT); //LCOV_EXCL_LINE
+       return SQLCLI_ReturnCode(context,-CLI_USER_MEMORY_IN_EXECUTOR_SEGMENT);
        
      desc->setDescItem(entry, SQLDESC_IND_PTR, (Long)ip, 0);
      desc->setDescItem(entry, SQLDESC_VAR_PTR, (Long)vp, 0);
@@ -635,7 +623,6 @@ static Lng32 getNumericHostVarInfo(Descriptor *desc,
                                   SQLDESC_IND_TYPE,
                                   (Lng32*) &ind_type,
                                   NULL, 0, NULL, 0);
-      //LCOV_EXCL_START
       if (retcode != 0)
         return SQLCLI_ReturnCode(desc->getContext(),retcode);
 
@@ -656,7 +643,6 @@ static Lng32 getNumericHostVarInfo(Descriptor *desc,
         default:
           retcode = -1;
         }
-      //LCOV_EXCL_STOP
     }
   return SQLCLI_ReturnCode(desc->getContext(),retcode);
 
@@ -720,7 +706,6 @@ static Lng32 InputValueFromNumericHostvar(Descriptor *desc,
                         &diagsArea);
   if (expRetcode != ex_expr::EXPR_OK)
     return ERROR;
-  //LCOV_EXCL_START - rare error check
   if (indPtr)
     {
       // values coming in should not be NULL, just make
@@ -747,7 +732,6 @@ static Lng32 InputValueFromNumericHostvar(Descriptor *desc,
       if (userIndicatorVal)
         return ERROR; // user specified NULL or junk
     }
-  //LCOV_EXCL_STOP
 
   return (SUCCESS);
 }
@@ -804,14 +788,11 @@ static Lng32 OutputValueIntoNumericHostvar(Descriptor *desc,
     }
   else
     {
-      //LCOV_EXCL_START
       ComDiagsArea & diags = context->diags();
 
       diags << DgSqlCode(-3164);
       return ERROR;
-      //LCOV_EXCL_STOP
     }
-  //LCOV_EXCL_START
   if (indPtr)
     {
       // move a zero into the indicator host variable
@@ -833,7 +814,6 @@ static Lng32 OutputValueIntoNumericHostvar(Descriptor *desc,
       if (expRetcode != ex_expr::EXPR_OK)
         return ERROR;
     }
-  //LCOV_EXCL_STOP
 
   return SUCCESS;
 }
@@ -975,7 +955,6 @@ Lng32 SQLCLI_AllocDesc(/*IN*/ CliGlobals * cliGlobals,
       // max entries allowed.
       maxEntries = 500;
     }
-  //LCOV_EXCL_START
   if (maxEntries < 1)
     {
       diags << DgSqlCode(- CLI_DATA_OUTOFRANGE)
@@ -983,7 +962,6 @@ Lng32 SQLCLI_AllocDesc(/*IN*/ CliGlobals * cliGlobals,
 
       return SQLCLI_ReturnCode(&currContext,-CLI_DATA_OUTOFRANGE);
     }
-  //LCOV_EXCL_STOP
 
   /* allocate a new descriptor in the current context.         */
   /* return the descriptor handle in desc_id, if name mode     */
@@ -1039,11 +1017,9 @@ Lng32 SQLCLI_AllocStmt(/*IN*/ CliGlobals * cliGlobals,
           (statement_id->name_mode == stmt_name) ||
           (statement_id->name_mode == stmt_via_desc))
         {
-	  //LCOV_EXCL_START
           diags << DgSqlCode(-CLI_INTERNAL_ERROR);
           return SQLCLI_ReturnCode(cliGlobals->currContext(),
 				   -CLI_INTERNAL_ERROR);
-	  //LCOV_EXCL_STOP
         }
 
 #if defined(MULTIPLE_CURSORS_PER_STATEMENT)
@@ -1061,10 +1037,8 @@ Lng32 SQLCLI_AllocStmt(/*IN*/ CliGlobals * cliGlobals,
 
       retcode = SQLCLI_SetCursorName(cliGlobals, cloned_statement, &desc);
 #endif
-      //LCOV_EXCL_START
       if (isERROR(retcode))
         return SQLCLI_ReturnCode(cliGlobals->currContext(),retcode);
-      //LCOV_EXCL_STOP
     }
   
   return CliEpilogue(cliGlobals, NULL);
@@ -1088,13 +1062,11 @@ Lng32 SQLCLI_AllocStmtForRS(/*IN*/ CliGlobals *cliGlobals,
   
   // The CALL statement must exist
   Statement *callStmt = currContext.getStatement(callStmtId);
-  //LCOV_EXCL_START
   if (!callStmt)
   {
     diags << DgSqlCode(-CLI_STMT_NOT_EXISTS);
     return SQLCLI_ReturnCode(&currContext, -CLI_STMT_NOT_EXISTS);
   }
-  //LCOV_EXCL_STOP
 
   // The parent statement must be a CALL. This can be determine 
   // from the root TDB's query type
@@ -1168,7 +1140,6 @@ Lng32 SQLCLI_AllocStmtForRS(/*IN*/ CliGlobals *cliGlobals,
 
 } // SQLCLI_AllocStmtForRS
 
-//LCOV_EXCL_START
 Lng32 SQLCLI_AssocFileNumber(/*IN*/    CliGlobals   * cliGlobals,
                             /*IN*/    SQLSTMT_ID * statement_id,
 		            /*IN*/    short        file_num)
@@ -1176,7 +1147,6 @@ Lng32 SQLCLI_AssocFileNumber(/*IN*/    CliGlobals   * cliGlobals,
   return 0;
 
   }
-//LCOV_EXCL_STOP
 Lng32 SQLCLI_BreakEnabled(/*IN*/ CliGlobals * cliGlobals,
 			 /*IN*/ UInt32 enabled )
 {
@@ -1191,7 +1161,6 @@ Lng32 SQLCLI_BreakEnabled(/*IN*/ CliGlobals * cliGlobals,
 #pragma warn(1506)  // warning elimination 
   return 0;
 }
-//LCOV_EXCL_START
 Lng32 SQLCLI_SPBreakRecvd(/*IN*/ CliGlobals * cliGlobals,
 			 /*OUT*/ UInt32 *breakRecvd)
 {
@@ -1207,7 +1176,6 @@ Lng32 SQLCLI_SPBreakRecvd(/*IN*/ CliGlobals * cliGlobals,
 #pragma warn(1506)  // warning elimination 
   return 0;
 }
-//LCOV_EXCL_STOP
 
 #pragma nowarn(770)   // warning elimination
 Lng32 SQLCLI_CreateContext(/*IN*/ CliGlobals * cliGlobals,
@@ -1220,7 +1188,6 @@ Lng32 SQLCLI_CreateContext(/*IN*/ CliGlobals * cliGlobals,
 
   ContextCli   & currContext = *(cliGlobals->currContext());
   ComDiagsArea & diags       = currContext.diags();
-  //LCOV_EXCL_START
   if (mustBeZero != 0)
   {
     //
@@ -1235,7 +1202,6 @@ Lng32 SQLCLI_CreateContext(/*IN*/ CliGlobals * cliGlobals,
           << DgString2("0");
     return SQLCLI_ReturnCode(&currContext, -CLI_RESERVED_ARGUMENT);
   }
-  //LCOV_EXCL_STOP
   ContextCli * newContext = NULL;
   retcode = cliGlobals->createContext(newContext);
   if (! newContext)
@@ -1281,7 +1247,6 @@ Lng32 SQLCLI_DeleteContext(/*IN*/  CliGlobals    * cliGlobals,
   return SQLCLI_DropContext(cliGlobals, context_handle);
 }
 
-//LCOV_EXCL_START - obsolete
 Lng32 SQLCLI_DropModule(/*IN*/ CliGlobals * cliGlobals,
 		       /*IN*/ const SQLMODULE_ID * module_id)
 {
@@ -1394,7 +1359,6 @@ Lng32 SQLCLI_ResetUdrErrorFlags_Internal(/*IN*/ CliGlobals * cliGlobals){
 
   return SUCCESS;
 }
-//LCOV_EXCL_STOP
 // A CLI wrapper around a ContextCli method to dynamically set JVM
 // startup options in the UDR server
 Lng32 SQLCLI_SetUdrRuntimeOptions_Internal(/*IN*/ CliGlobals *cliGlobals,
@@ -1403,12 +1367,10 @@ Lng32 SQLCLI_SetUdrRuntimeOptions_Internal(/*IN*/ CliGlobals *cliGlobals,
                                           /*IN*/ const char *delimiters,
                                           /*IN*/ ULng32 delimsLen)
 {
-  //LCOV_EXCL_START
   if (!cliGlobals)
   {
     return -CLI_NO_CURRENT_CONTEXT;
   }
-  //LCOV_EXCL_STOP
   
 
   ContextCli &currContext = *(cliGlobals->currContext());
@@ -1418,18 +1380,15 @@ Lng32 SQLCLI_SetUdrRuntimeOptions_Internal(/*IN*/ CliGlobals *cliGlobals,
   return SQLCLI_ReturnCode(&currContext, retcode);
 }
 
-//LCOV_EXCL_STOP
 Lng32 SQLCLI_DeallocDesc(/*IN*/ CliGlobals * cliGlobals,
 			/*IN*/ SQLDESC_ID * desc_id)
 {
 
   Lng32 retcode;
-  //LCOV_EXCL_START
   if (!cliGlobals)
     {
       return -CLI_NO_CURRENT_CONTEXT;
     }
-  //LCOV_EXCL_STOP
 
 
   ContextCli   & currContext = *(cliGlobals->currContext());
@@ -1468,7 +1427,6 @@ Lng32 SQLCLI_DeallocStmt(/*IN*/ CliGlobals * cliGlobals,
 
   return SQLCLI_ReturnCode(&currContext,retcode);
 }
-//LCOV_EXCL_START
 Lng32 SQLCLI_DefineDesc(/*IN*/ CliGlobals * cliGlobals,
 		       /*IN*/ SQLSTMT_ID * statement_id,
                          /* (SQLWHAT_DESC) *IN*/       Lng32   what_descriptor,
@@ -1507,18 +1465,15 @@ Lng32 SQLCLI_DefineDesc(/*IN*/ CliGlobals * cliGlobals,
 
   return SUCCESS;
 }
-//LCOV_EXCL_STOP
 Lng32 SQLCLI_DescribeStmt(/*IN*/ CliGlobals * cliGlobals,
 			 /*IN*/           SQLSTMT_ID * statement_id,
 			 /*IN  OPTIONAL*/ SQLDESC_ID * input_descriptor,
 			 /*IN  OPTIONAL*/ SQLDESC_ID * output_descriptor)
 {
-  //LCOV_EXCL_START
   if (!cliGlobals)
     {
       return -CLI_NO_CURRENT_CONTEXT;
     }
-  //LCOV_EXCL_STOP
 
 
   Lng32 retcode;
@@ -1530,13 +1485,11 @@ Lng32 SQLCLI_DescribeStmt(/*IN*/ CliGlobals * cliGlobals,
   Statement * stmt = currContext.getStatement(statement_id);
 
   /* stmt must exist */
-  //LCOV_EXCL_START
   if (!stmt)
     {
       diags << DgSqlCode(-CLI_STMT_NOT_EXISTS);
       return SQLCLI_ReturnCode(&currContext,-CLI_STMT_NOT_EXISTS);
     }
-  //LCOV_EXCL_STOP
 
   /* stmt should be a dynamic statement and must not be in INITIAL state */
   /* if it is in INITIAL state then the statement did not get prepared. */
@@ -1566,13 +1519,11 @@ Lng32 SQLCLI_DescribeStmt(/*IN*/ CliGlobals * cliGlobals,
   if (input_descriptor)
     {
       Descriptor * input_desc = currContext.getDescriptor(input_descriptor);
-      //LCOV_EXCL_START
       if (!input_desc)
         {
           diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
           return SQLCLI_ReturnCode(&currContext,-CLI_DESC_NOT_EXISTS);
         }
-      //LCOV_EXCL_STOP
 
       retcode = stmt->describe(input_desc,
                                SQLWHAT_INPUT_DESC,
@@ -1600,7 +1551,6 @@ Lng32 SQLCLI_DescribeStmt(/*IN*/ CliGlobals * cliGlobals,
 
   return CliEpilogue(cliGlobals, statement_id);
 }
-//LCOV_EXCL_START
 Lng32 SQLCLI_DisassocFileNumber(/*IN*/          CliGlobals * cliGlobals,
                                /*IN*/          SQLSTMT_ID * statement_id)
   {
@@ -1647,7 +1597,6 @@ Lng32 SQLCLI_DropContext(/*IN*/ CliGlobals * cliGlobals,
   return SQLCLI_ReturnCode(defaultContext,retcode);
 }
 
-//LCOV_EXCL_STOP
 Lng32 SQLCLI_SetRowsetDescPointers(CliGlobals * cliGlobals,
 				  SQLDESC_ID  * desc_id, 
 				  Lng32    rowset_size,
@@ -1657,12 +1606,10 @@ Lng32 SQLCLI_SetRowsetDescPointers(CliGlobals * cliGlobals,
 				  va_list    ap,
 				  SQLCLI_QUAD_FIELDS    quad_fields[])
 {
-  //LCOV_EXCL_START
   if (!desc_id)
     {
       return -CLI_INTERNAL_ERROR;
     }
-  //LCOV_EXCL_STOP
 
 
   ContextCli   & currContext = *(cliGlobals->currContext());
@@ -1685,12 +1632,10 @@ Lng32 SQLCLI_SetRowsetDescPointers(CliGlobals * cliGlobals,
            entry < starting_entry+num_quadruple_fields;
            entry++, i++)
         {
-	  //LCOV_EXCL_START
 	  if (desc->getUsedEntryCount() < entry) {
 	    diags << DgSqlCode(-CLI_INVALID_DESC_ENTRY);
 	    return SQLCLI_ReturnCode(&currContext,-CLI_INVALID_DESC_ENTRY);
 	  }
-	  //LCOV_EXCL_STOP
 
           // need to re-order this to avoid possible problems with not setting
           // the data area (i.e. VAR_PTR) last.
@@ -1723,7 +1668,6 @@ Lng32 SQLCLI_SetRowsetDescPointers(CliGlobals * cliGlobals,
 
   return SUCCESS;
 }
-  //LCOV_EXCL_START - unused method 
 Lng32 SQLCLI_GetRowsetNumprocessed(CliGlobals * cliGlobals,
 				  SQLDESC_ID * desc_id, 
                                     Lng32 &rowset_nprocessed)
@@ -1756,7 +1700,6 @@ Lng32 SQLCLI_GetRowsetNumprocessed(CliGlobals * cliGlobals,
   retcode = CliEpilogue(cliGlobals, NULL);
   return SQLCLI_ReturnCode(&currContext,retcode);
 }
-//LCOV_EXCL_STOP
 static NABoolean SQLCLI_GetRetryInfo(CliGlobals * cliGlobals,
 				     Lng32 retcode,
 				     AQRStatementInfo * aqrSI,
@@ -1843,11 +1786,9 @@ static Lng32 SQLCLI_RetryDeallocStmt(
       init_SQLDESC_ID(temp_input_desc_id, SQLCLI_CURRENT_VERSION, desc_handle, module);
 
       retcode = SQLCLI_AllocDescInt(cliGlobals, temp_input_desc_id, 1);
-      //LCOV_EXCL_START
       if (isERROR(retcode))
 	return retcode;
     }
-  //LCOV_EXCL_STOP
 
   if (! aqrSI->getRetryOutputDesc())
     {
@@ -1858,20 +1799,16 @@ static Lng32 SQLCLI_RetryDeallocStmt(
       init_SQLDESC_ID(temp_output_desc_id, SQLCLI_CURRENT_VERSION, desc_handle, module);
 
       retcode = SQLCLI_AllocDescInt(cliGlobals, temp_output_desc_id, 1);
-      //LCOV_EXCL_START
       if (isERROR(retcode))
 	return retcode;
-      //LCOV_EXCL_STOP
     }
 
   retcode = SQLCLI_DescribeStmt(cliGlobals,
 				aqrSI->getRetryStatementId(),
 				temp_input_desc_id,
 				temp_output_desc_id);
-  //LCOV_EXCL_START
   if (isERROR(retcode) && (retcode != -CLI_STMT_NOT_PREPARED))
     return retcode;
-  //LCOV_EXCL_STOP
   if (retcode == -CLI_STMT_NOT_PREPARED)
     diags.clear();
 
@@ -1881,10 +1818,8 @@ static Lng32 SQLCLI_RetryDeallocStmt(
   retcode = SQLCLI_DeallocStmt(cliGlobals, 
 			       aqrSI->getRetryStatementId());
   
-  //LCOV_EXCL_START
   if (isERROR(retcode))
     return retcode;
-  //LCOV_EXCL_STOP
 
   return retcode;
 }
@@ -1941,39 +1876,31 @@ static Lng32 SQLCLI_RetryValidateDescs
  
 
   Descriptor * currInputDesc = currContext.getDescriptor(curr_input_desc_id);
-  //LCOV_EXCL_START
   if (!currInputDesc)
     {
       diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
       return -CLI_DESC_NOT_EXISTS;
     }
-  //LCOV_EXCL_STOP
 
   Descriptor * currOutputDesc = currContext.getDescriptor(curr_output_desc_id);
-  //LCOV_EXCL_START
   if (!currOutputDesc)
     {
       diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
       return -CLI_DESC_NOT_EXISTS;
     }
-  //LCOV_EXCL_STOP
   
   Descriptor * newInputDesc = currContext.getDescriptor(&new_input_desc_id);
-  //LCOV_EXCL_START
   if (!newInputDesc)
     {
       diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
       return -CLI_DESC_NOT_EXISTS;
     }
-  //LCOV_EXCL_STOP
   Descriptor * newOutputDesc = currContext.getDescriptor(&new_output_desc_id);
- //LCOV_EXCL_START
   if (!newOutputDesc)
     {
       diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
       return -CLI_DESC_NOT_EXISTS;
     }
-  //LCOV_EXCL_STOP
   // Before describing , save the flags from the old descriptors that the user
   // may have set using a setDescItem call
   newOutputDesc->setDescFlags( currOutputDesc->getDescFlags());
@@ -1982,26 +1909,20 @@ static Lng32 SQLCLI_RetryValidateDescs
 				statement_id,
 				&new_input_desc_id,
 				&new_output_desc_id);
-  //LCOV_EXCL_START
   if (isERROR(retcode))
     return retcode;
-  //LCOV_EXCL_STOP
   newInputDesc = currContext.getDescriptor(&new_input_desc_id);
-  //LCOV_EXCL_START
   if (!newInputDesc)
     {
       diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
       return -CLI_DESC_NOT_EXISTS;
     }
-  //LCOV_EXCL_STOP
   newOutputDesc = currContext.getDescriptor(&new_output_desc_id);
-//LCOV_EXCL_START
   if (!newOutputDesc)
     {
       diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
       return -CLI_DESC_NOT_EXISTS;
     }
-//LCOV_EXCL_STOP
   if (NOT (*currInputDesc == *newInputDesc))
     {
       retcode = -EXE_USER_PREPARE_NEEDED;
@@ -2529,7 +2450,6 @@ Lng32 SQLCLI_ProcessRetryQuery(
 		  if (type == AQRInfo::RETRY_WITH_DECACHE)
 		    flags |= PREPARE_WITH_DECACHE;
                    		 
-		  //LCOV_EXCL_START
 		  // log an ems event, unless disabled or if regressions
 		  // are running.
 		  char *sqlmxRegr = NULL;
@@ -2563,7 +2483,6 @@ Lng32 SQLCLI_ProcessRetryQuery(
 
 		      SQLMXLoggingArea::logExecRtInfo(NULL, 0, emsText, 0);
 		    }
-		  //LCOV_EXCL_STOP
 
 		  retcode = 
 		    SQLCLI_RetryQuery(
@@ -3270,14 +3189,12 @@ Lng32 SQLCLI_ExecDirect(/*IN*/           CliGlobals * cliGlobals,
   /* prepare the statement */
 
   Statement * stmt = currContext.getStatement(statement_id);
-  //LCOV_EXCL_START
   /* stmt must exist */
   if (!stmt)
     {
       diags << DgSqlCode(-CLI_STMT_NOT_EXISTS);
       return SQLCLI_ReturnCode(&currContext,-CLI_STMT_NOT_EXISTS);
     }
-  //LCOV_EXCL_STOP
   stmt->getGlobals()->clearCancelState();
 
   StrTarget strTarget;
@@ -3286,13 +3203,11 @@ Lng32 SQLCLI_ExecDirect(/*IN*/           CliGlobals * cliGlobals,
     return SQLCLI_ReturnCode(&currContext,retcode);
   // CLI callers are not allowed to request PREPARE or EXEC DIRECT
   // operations on stored procedure result sets.
-  //LCOV_EXCL_START
   if (stmt->getParentCall())
   {
     diags << DgSqlCode(-EXE_UDR_RS_PREPARE_NOT_ALLOWED);
     return SQLCLI_ReturnCode(&currContext, -EXE_UDR_RS_PREPARE_NOT_ALLOWED);
   }
-  //LCOV_EXCL_STOP
 
   // For ExecDirect, MXOSRVR calls SQL_EXEC_SetStmtAttr(NULL) to set the unique id
   // before calling SQL_EXEC_EXECDirect. So, we need to use them
@@ -3354,14 +3269,12 @@ Lng32 SQLCLI_ExecDirect2(/*IN*/           CliGlobals * cliGlobals,
   /* prepare the statement */
 
   Statement * stmt = currContext.getStatement(statement_id);
-  //LCOV_EXCL_START
   /* stmt must exist */
   if (!stmt)
     {
       diags << DgSqlCode(-CLI_STMT_NOT_EXISTS);
       return SQLCLI_ReturnCode(&currContext,-CLI_STMT_NOT_EXISTS);
     }
-  //LCOV_EXCL_STOP
   stmt->getGlobals()->clearCancelState();
 
   StrTarget strTarget;
@@ -3370,13 +3283,11 @@ Lng32 SQLCLI_ExecDirect2(/*IN*/           CliGlobals * cliGlobals,
     return SQLCLI_ReturnCode(&currContext,retcode);
   // CLI callers are not allowed to request PREPARE or EXEC DIRECT
   // operations on stored procedure result sets.
-  //LCOV_EXCL_START
   if (stmt->getParentCall())
   {
     diags << DgSqlCode(-EXE_UDR_RS_PREPARE_NOT_ALLOWED);
     return SQLCLI_ReturnCode(&currContext, -EXE_UDR_RS_PREPARE_NOT_ALLOWED);
   }
-  //LCOV_EXCL_STOP
 
   // For ExecDirect, MXOSRVR calls SQL_EXEC_SetStmtAttr(NULL) to set the unique id
   // before calling SQL_EXEC_EXECDirect. So, we need to use them
@@ -3567,7 +3478,6 @@ if (!cliGlobals)
   
   return retcode;
 }
-//LCOV_EXCL_START
 
 /////////////////////////////////////////////////////////////////////
 
@@ -3630,7 +3540,6 @@ Lng32 SQLCLI_Cancel(/*IN*/ CliGlobals * cliGlobals,
 
   return retcode;
 }
-//LCOV_EXCL_STOP
 Lng32 SQLCLI_GetDescEntryCount(/*IN*/ CliGlobals * cliGlobals,
 			      
                                 /*IN*/ SQLDESC_ID * desc_id,
@@ -3653,23 +3562,19 @@ Lng32 SQLCLI_GetDescEntryCount(/*IN*/ CliGlobals * cliGlobals,
   Descriptor * desc = currContext.getDescriptor(desc_id);
 
   /* descriptor must exist */
-  //LCOV_EXCL_START
   if (!desc)
     {
       diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
       return SQLCLI_ReturnCode(&currContext,-CLI_DESC_NOT_EXISTS);
     }
-  //LCOV_EXCL_STOP
   Descriptor * output_desc = currContext.getDescriptor(output_descriptor);
 
   /* descriptor must exist */
-  //LCOV_EXCL_START
   if (!output_desc)
     {
       diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
       return SQLCLI_ReturnCode(&currContext,-CLI_DESC_NOT_EXISTS);
     }
-  //LCOV_EXCL_STOP
 
   Lng32 retcode = OutputValueIntoNumericHostvar(
                                                output_desc,
@@ -4425,7 +4330,6 @@ static Lng32 getStmtInfo(
     case SQLDIAG_AVERAGE_STREAM_WAIT:
       *(ComDiagBigInt *)numeric_value = diags.getAvgStreamWaitTime();// returns ComDiagBigInt
       break;
-      //LCOV_EXCL_START
     // The SQL/MP extension statement info items that are supported.
     case SQLDIAG_COST:
       {
@@ -4439,7 +4343,6 @@ static Lng32 getStmtInfo(
 	    *(Lng32 *)numeric_value = (Lng32) temp_double;
 	  };
       }
-      //LCOV_EXCL_STOP
     break;
     
     // The SQL/MP extension statement info items aren't currently unsupported.
@@ -4569,7 +4472,6 @@ Lng32 SQLCLI_GetDiagnosticsStmtInfo(/*IN*/ CliGlobals * cliGlobals,
 
 	      value = number;
 	    }
-	  //LCOV_EXCL_START
 	  else  // SQLDIAG_ROWSET_ROW_COUNT
 	  {
 	    // retrieve user provided rowset size into targetRowsetSize
@@ -4602,7 +4504,6 @@ Lng32 SQLCLI_GetDiagnosticsStmtInfo(/*IN*/ CliGlobals * cliGlobals,
 	      targetRowsetSize = diags.numEntriesInRowsetRowCountArray();
 	    }
 	  }
-	  //LCOV_EXCL_STOP
 	  CollHeap * heap = output_desc->getContext()->exCollHeap();
 	  ComDiagsArea * diagsArea = output_desc->getContext()->getDiagsArea();
 	  Lng32 oldDiagsAreaMark = diagsArea->mark();
@@ -5082,7 +4983,6 @@ Lng32 SQLCLI_GetDiagnosticsCondInfo(/*IN*/ CliGlobals * cliGlobals,
 
   return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQLCLI_GetPackedDiagnostics(
   /*IN*/             CliGlobals * cliGlobals,
   /*OUT*/   IpcMessageBufferPtr   message_buffer_ptr,
@@ -5111,7 +5011,6 @@ Lng32 SQLCLI_GetPackedDiagnostics(
 
   return retcode;
 }
-//LCOV_EXCL_STOP
 Lng32 GetDiagnosticsCondInfoSwitchStatement(
      /*IN*/ CliGlobals * cliGlobals,
      /*IN* (SQLDIAG_COND_INFO_ITEM_ID) */ Lng32 what_to_get,
@@ -5131,7 +5030,6 @@ Lng32 GetDiagnosticsCondInfoSwitchStatement(
     case SQLDIAG_SQLCODE:        /* (numeric) the SQLCODE */
       *numeric_value = condition.getSQLCODE();
       break;
-      //LCOV_EXCL_START
     case SQLDIAG_COND_NUMBER:    /* (numeric) condition number */
       *numeric_value = condition.getConditionNumber();
       break;
@@ -5240,7 +5138,6 @@ Lng32 GetDiagnosticsCondInfoSwitchStatement(
       // do nothing -- no way to report error, so, okay.
       break;
     }
-  //LCOV_EXCL_STOP
  return 0;
 }
 
@@ -5383,7 +5280,6 @@ Lng32 SQLCLI_GetSQLCODE(/*IN*/ CliGlobals * cliGlobals,
 
   return SUCCESS; // this call always succeeds, no need to check errors!
 }
-//LCOV_EXCL_START
 Lng32 SQLCLI_GetMainSQLSTATE(/*IN*/ CliGlobals * cliGlobals,
                 /*IN*/ SQLSTMT_ID * statement_id,
 		/*IN*/  Lng32 sqlcode,
@@ -5810,7 +5706,6 @@ Lng32 SQLCLI_StoreExplainData(
   return retcode;
 }
 
-//LCOV_EXCL_START
 Lng32 SQLCLI_ResDescName(/*IN*/           CliGlobals * cliGlobals,
 			/*INOUT*/        SQLDESC_ID * descriptor_id,
 			/*IN  OPTIONAL*/ SQLSTMT_ID * from_statement,
@@ -5913,7 +5808,6 @@ Lng32 SQLCLI_ResStmtName(/*IN*/ CliGlobals * cliGlobals,
   
   return SUCCESS;
 }
-//LCOV_EXCL_STOP
 // statement_id must point to an existing statement
 // The Descriptor Id  cursor_name must be of name_mode 
 // cursor_name or cursor_via_desc   **exception ODBC/JDBC
@@ -5931,17 +5825,14 @@ Lng32 SQLCLI_SetCursorName(/*IN*/ CliGlobals * cliGlobals,
 
   // create initial context, if first call, and add module, if any.
   retcode = CliPrologue(cliGlobals,statement_id->module);
-  //LCOV_EXCL_START
   if (isERROR(retcode))
     return retcode;
-  //LCOV_EXCL_STOP
 
   ContextCli   & currContext = *(cliGlobals->currContext());
   ComDiagsArea & diags       = currContext.diags();
 
   Statement * stmt = currContext.getStatement(statement_id);
 
-  //LCOV_EXCL_START
   /* stmt must exist */
   if (!stmt)
     {
@@ -5969,7 +5860,6 @@ Lng32 SQLCLI_SetCursorName(/*IN*/ CliGlobals * cliGlobals,
     	  diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
           return SQLCLI_ReturnCode(&currContext,-CLI_DESC_NOT_EXISTS);
     	}
-      //LCOV_EXCL_STOP
       stmt->setCursorName(desc->getVarData(1));
       
       return SUCCESS;
@@ -5983,7 +5873,6 @@ Lng32 SQLCLI_SetCursorName(/*IN*/ CliGlobals * cliGlobals,
       stmt->setCursorName(cursor_id->identifier);
       break; 
     case curs_via_desc:
-      //LCOV_EXCL_START
       // This is the extended dynamic case. In this case the CLI will
       // convert/check the input to valid ansi format  
       curs_id = Descriptor::GetNameViaDesc((SQLDESC_ID *)cursor_id,&currContext,heap);
@@ -5994,7 +5883,6 @@ Lng32 SQLCLI_SetCursorName(/*IN*/ CliGlobals * cliGlobals,
       diags << DgSqlCode(-CLI_INVALID_ATTR_VALUE);
       return SQLCLI_ReturnCode(&currContext,-CLI_INVALID_ATTR_VALUE);
       break;
-      //LCOV_EXCL_STOP
     }
   return SUCCESS;
 }
@@ -6029,19 +5917,15 @@ Lng32 SQLCLI_SetStmtAttr( /*IN*/ CliGlobals *cliGlobals,
     {
       switch (numeric_value)
 	{
-	  //LCOV_EXCL_START
 	case SQL_NONHOLDABLE:
           retcode = stmt->setHoldable(diags, FALSE);
 	  break;
-	  //LCOV_EXCL_STOP
 	case SQL_HOLDABLE:
 	  retcode = stmt->setHoldable(diags, TRUE);
 	  break;
-	  //LCOV_EXCL_START
 	default:
 	  diags << DgSqlCode(-CLI_INVALID_ATTR_VALUE);
 	  return SQLCLI_ReturnCode(&currContext,-CLI_INVALID_ATTR_VALUE);
-	  //LCOV_EXCL_STOP
 	}
     }
   else if (attrName == SQL_ATTR_INPUT_ARRAY_MAXSIZE)   
@@ -6078,7 +5962,6 @@ Lng32 SQLCLI_SetStmtAttr( /*IN*/ CliGlobals *cliGlobals,
   }
   else if (attrName == SQL_ATTR_NOT_ATOMIC_FAILURE_LIMIT)   
     {
-      //LCOV_EXCL_START
       if ((numeric_value >= 30)||
 	(numeric_value == ComCondition::NO_LIMIT_ON_ERROR_CONDITIONS)) {
 	retcode = stmt->setNotAtomicFailureLimit(diags, numeric_value);
@@ -6087,7 +5970,6 @@ Lng32 SQLCLI_SetStmtAttr( /*IN*/ CliGlobals *cliGlobals,
 	diags << DgSqlCode(-CLI_INVALID_ATTR_VALUE);
 	return SQLCLI_ReturnCode(&currContext,-CLI_INVALID_ATTR_VALUE);
       }
-      //LCOV_EXCL_STOP
     }
   else if (attrName == SQL_ATTR_UNIQUE_STMT_ID)
     {
@@ -6105,13 +5987,11 @@ Lng32 SQLCLI_SetStmtAttr( /*IN*/ CliGlobals *cliGlobals,
         diags << DgSqlCode(retcode);
       }
     }
-  //LCOV_EXCL_START
   else {
     diags << DgSqlCode(-CLI_INVALID_ATTR_NAME);
     return SQLCLI_ReturnCode(&currContext,-CLI_INVALID_ATTR_NAME);
     
   }
-  //LCOV_EXCL_STOP
 
   if (retcode)
     return diags.mainSQLCODE();
@@ -6450,7 +6330,6 @@ Lng32 SQLCLI_SetSessionAttr(/*IN*/ CliGlobals *cliGlobals,
     }
     break;
 
-    //LCOV_EXCL_START
     case SESSION_PARENT_QID:
     {
       SessionDefaults *sd = currContext.getSessionDefaults();
@@ -6458,7 +6337,6 @@ Lng32 SQLCLI_SetSessionAttr(/*IN*/ CliGlobals *cliGlobals,
         sd->setParentQid(string_value, strlen(string_value));
     }
     break;
-    //LCOV_EXCL_STOP
     default:
     {
       // Other attributes can be supported in time
@@ -6638,7 +6516,6 @@ Lng32 CopyOneStmtAttr (/*IN*/   Statement &stmt,
   {
     *numeric_value = stmt.getConsumerCpu(index - 1);
   }
- //LCOV_EXCL_START
   else if (attrName == SQL_ATTR_PARENT_QID)
   {
    
@@ -6679,7 +6556,6 @@ Lng32 CopyOneStmtAttr (/*IN*/   Statement &stmt,
     diags << DgSqlCode(-CLI_INVALID_ATTR_NAME);
     return SQLCLI_ReturnCode(&context,-CLI_INVALID_ATTR_NAME);
   }
- //LCOV_EXCL_STOP
   
   return retcode;
 }
@@ -6758,7 +6634,6 @@ Lng32 SQLCLI_GetStmtAttrs( /*IN*/ CliGlobals *cliGlobals,
   
   return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQLCLI_SetDescEntryCount(/*IN*/ CliGlobals * cliGlobals,
 			      /*IN*/ SQLDESC_ID * desc_id,
                               /*IN*/ SQLDESC_ID * input_descriptor)
@@ -6813,7 +6688,6 @@ Lng32 SQLCLI_SetDescEntryCount(/*IN*/ CliGlobals * cliGlobals,
   
   return SUCCESS;
 }
-//LCOV_EXCL_STOP
 Lng32 SQLCLI_SetDescItems(/*IN*/ CliGlobals * cliGlobals,
 			 /*IN*/   SQLDESC_ID * desc_id,
                            /*IN*/ SQLDESC_ITEM   desc_items[],
@@ -7006,13 +6880,11 @@ Lng32 SQLCLI_SetDescItems2(/*IN*/ CliGlobals * cliGlobals,
       if (entry > desc->getUsedEntryCount()) 
 	{
 	  retcode = desc->addEntry(entry);
-	  //LCOV_EXCL_START
 	  if (isERROR(retcode))
 	    {
 	      diags << DgSqlCode(-CLI_INTERNAL_ERROR);
 	      return SQLCLI_ReturnCode(&currContext,-CLI_INTERNAL_ERROR);
 	    }
-	  //LCOV_EXCL_STOP
 	}
 
       // if item to be set is vardata, get input data length.
@@ -7207,7 +7079,6 @@ Lng32 SQLCLI_Xact(/*IN*/ CliGlobals * cliGlobals,
 	  }
       }
     break;
-    //LCOV_EXCL_START 
     case SQLTRANS_ROLLBACK_IMPLICIT_XN:
       {
         if ((currContext.getTransaction()->xnInProgress()) &&
@@ -7222,10 +7093,8 @@ Lng32 SQLCLI_Xact(/*IN*/ CliGlobals * cliGlobals,
 	      }
           }
       }
-      //LCOV_EXCL_STOP
       break;
 
-      //LCOV_EXCL_START
     case SQLTRANS_COMMIT:
       {
 	if ((currContext.getTransaction()->xnInProgress()) &&
@@ -7242,10 +7111,8 @@ Lng32 SQLCLI_Xact(/*IN*/ CliGlobals * cliGlobals,
 	  
 	  }
       }
-      //LCOV_EXCL_STOP
     break;
 
-      //LCOV_EXCL_START
     case SQLTRANS_ROLLBACK:
       {
 	if ((currContext.getTransaction()->xnInProgress()) &&
@@ -7259,10 +7126,8 @@ Lng32 SQLCLI_Xact(/*IN*/ CliGlobals * cliGlobals,
               }
 	  }
       }
-      //LCOV_EXCL_STOP
     break;
 
-      //LCOV_EXCL_START
     case SQLTRANS_BEGIN:
       {
 	if (! (currContext.getTransaction()->xnInProgress()))
@@ -7275,7 +7140,6 @@ Lng32 SQLCLI_Xact(/*IN*/ CliGlobals * cliGlobals,
 	      }
 	  }
       }
-      //LCOV_EXCL_STOP
     break;
 
     case SQLTRANS_INHERIT:
@@ -7285,7 +7149,6 @@ Lng32 SQLCLI_Xact(/*IN*/ CliGlobals * cliGlobals,
       }
     break;
 
-      //LCOV_EXCL_START
     case SQLTRANS_BEGIN_WITH_DP2_XNS:
       {
 	if (! (currContext.getTransaction()->xnInProgress()))
@@ -7294,7 +7157,6 @@ Lng32 SQLCLI_Xact(/*IN*/ CliGlobals * cliGlobals,
 	    currContext.getTransaction()->setDp2Xns(TRUE);
 	  }
       }
-      //LCOV_EXCL_STOP
     break;
 
     default:
@@ -7630,7 +7492,6 @@ Lng32 SQLCLI_SetDescItem(
   return SUCCESS;
 }
 
-//LCOV_EXCLSTART
 // -----------------------------------------------------------------------
 // NOTE: this procedure will go away, please use GetDiagnosticsStmtInfo()
 // instead!!!
@@ -7662,7 +7523,6 @@ Lng32 SQLCLI_GetRowsAffected(/*IN*/ CliGlobals * cliGlobals,
   
   return SUCCESS;
 }
-//LCOV_EXCL_STOP
 Lng32 SQLCLI_MergeDiagnostics(/*IN*/ CliGlobals * cliGlobals,
 			     /*INOUT*/ ComDiagsArea & newDiags)
 {
@@ -7865,7 +7725,6 @@ Lng32 SQLCLI_GetCollectStatsType_Internal(/*IN*/ CliGlobals * cliGlobals,
   return retcode;
 #pragma warn(769)  // warning elimination 
 }
-//LCOV_EXCL_STOP
 
 // For internal use only -- do not document!
 Lng32 SQLCLI_GetTotalTcbSpace(/*IN*/ CliGlobals * cliGlobals,
@@ -8048,7 +7907,6 @@ Lng32 SQLCLI_LocaleToUTF8 (
   return error;
 }
 
-//LCOV_EXCL_START
 Lng32 SQLCLI_LocaleToUTF16 (
                     CliGlobals *cliGlobals,
                     Int32 conv_charset,
@@ -10883,7 +10741,6 @@ Lng32 SQLCLI_SeqGenCliInterface
   return 0;
 }
 
-//LCOV_EXCL_STOP
 
 Int32 SQLCLI_GetRoutine
 (

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/cli/Cli.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.h b/core/sql/cli/Cli.h
index 4784af1..35cee3c 100644
--- a/core/sql/cli/Cli.h
+++ b/core/sql/cli/Cli.h
@@ -115,13 +115,11 @@ extern "C"
                               /*IN*/ SQLSTMT_ID *callStmtId,
                               /*IN*/ Lng32 resultSetIndex,
                               /*INOUT*/ SQLSTMT_ID *resultSetStmtId);
-//LCOV_EXCL_START
 
    Lng32 SQLCLI_AssocFileNumber(/*IN*/    CliGlobals   * cliGlobals,
                                /*IN*/    SQLSTMT_ID * statement_id,
 		               /*IN*/    short         file_number);
 
-//LCOV_EXCL_STOP
 Int32  SQLCLI_GetDiskMaxSize (
 			      /*IN*/ CliGlobals *cliGlobals,
 			      /*IN*/ char *volname,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/cli/CliExpExchange.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliExpExchange.cpp b/core/sql/cli/CliExpExchange.cpp
index 1713409..15e3e7b 100644
--- a/core/sql/cli/CliExpExchange.cpp
+++ b/core/sql/cli/CliExpExchange.cpp
@@ -944,7 +944,6 @@ next_clause:
   
   desc->setBulkMoveSetup(TRUE);
 
-  //LCOV_EXCL_START
   if (getenv("BULKMOVE") && getenv("BULKMOVEINFO") &&
       desc->bulkMoveInfo())
     {
@@ -971,7 +970,6 @@ next_clause:
 	  cout << endl;
 	}
     }
-  //LCOV_EXCL_STOP
 }
 #pragma warning (default : 4273)   //warning elimination
 
@@ -2518,7 +2516,6 @@ then place the following four lines of code after the call to setRowNumberInCli.
       return ex_expr::EXPR_ERROR;
 */
 // error path not taken . This is only if something bad happens in NVT
-//LCOV_EXCL_START
 #pragma warning (disable : 4273)   //warning elimination
 ex_expr::exp_return_type
 InputOutputExpr::inputSingleRowValue(atp_struct *atp,
@@ -3091,7 +3088,6 @@ error_return:
   
   return ex_expr::EXPR_ERROR;
 }
-//LCOV_EXCL_STOP
 ex_expr::exp_return_type
 InputOutputExpr::inputRowwiseRowsetValues(atp_struct *atp,
 					  void * inputDesc_,
@@ -3340,7 +3336,6 @@ InputOutputExpr::inputRowwiseRowsetValues(atp_struct *atp,
   else
     {
       // error path not taken . This is only if something bad happens in NVT
-      //LCOV_EXCL_START
       if (isDbtr)
 	{
 	  // rowwise rowsets from dbtr *must* use the optimized input
@@ -3402,7 +3397,6 @@ error_return:
 		    (intParam3 != 0 ? &intParam3 : NULL));
   if (diagsArea != atp->getDiagsArea())
     atp->setDiagsArea(diagsArea);	
-  //LCOV_EXCL_STOP
   return ex_expr::EXPR_ERROR;
 }
 
@@ -3482,12 +3476,10 @@ InputOutputExpr::inputValues(atp_struct *atp,
   
   if (inputDesc && inputDesc->rowwiseRowset())
     {
-      //LCOV_EXCL_START
       ExRaiseSqlError(heap, &diagsArea, CLI_ROWWISE_ROWSETS_NOT_SUPPORTED);
       if (diagsArea != atp->getDiagsArea())
 	atp->setDiagsArea(diagsArea);
       return ex_expr::EXPR_ERROR;
-      //LCOV_EXCL_STOP
     }
 
   // If bulk move has not been disabled before, then check to see if bulk
@@ -3970,7 +3962,6 @@ InputOutputExpr::inputValues(atp_struct *atp,
                if ( CharInfo::checkCodePoint((NAWchar*)source, realSourceLen,
                                           CharInfo::UNICODE ) == FALSE )
                {
-		 //LCOV_EXCL_START
                  // Error code 3400 falls in CLI error code area, but it is
                  // a perfect fit to use here (as an exeutor error).
                  ExRaiseSqlError(heap, &diagsArea, (ExeErrorCode)3400);
@@ -3985,7 +3976,6 @@ InputOutputExpr::inputValues(atp_struct *atp,
 		  continue;
 		 else
 		  return ex_expr::EXPR_ERROR;
-		 //LCOV_EXCL_STOP
                }
             }
 	    

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/cli/CliExtern.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliExtern.cpp b/core/sql/cli/CliExtern.cpp
index d04602b..f943c26 100644
--- a/core/sql/cli/CliExtern.cpp
+++ b/core/sql/cli/CliExtern.cpp
@@ -979,7 +979,6 @@ Lng32 SQL_EXEC_ALLOCDESC (
 
   return SQL_EXEC_AllocDesc(desc_id, input_descriptor);
 };
-//LCOV_EXCL_STOP
 
 
 Lng32 SQL_EXEC_AllocDescBasic(/*INOUT*/       SQLDESC_ID * desc_id,
@@ -1058,7 +1057,6 @@ Lng32 SQL_EXEC_AllocStmt(/*INOUT*/       SQLSTMT_ID * new_statement_id,
 }
 
 
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_ALLOCSTMT (
 		/*INOUT*/ SQLSTMT_ID * new_statement_id,
 		/*IN OPTIONAL*/ SQLSTMT_ID * cloned_statement)
@@ -1069,7 +1067,6 @@ Lng32 SQL_EXEC_ALLOCSTMT (
 
   return SQL_EXEC_AllocStmt(new_statement_id, cloned_statement);
 };
-//LCOV_EXCL_STOP
 
 Lng32 SQL_EXEC_AllocStmtForRS(/*IN*/ SQLSTMT_ID *callStmtId,
                              /*IN*/ Lng32 resultSetIndex,
@@ -1109,7 +1106,6 @@ Lng32 SQL_EXEC_AllocStmtForRS(/*IN*/ SQLSTMT_ID *callStmtId,
    tmpSemaphore->release();
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_ALLOCSTMTFORRS (
                 /*IN*/ SQLSTMT_ID *callStmtId,
                 /*IN*/ Lng32 resultSetIndex,
@@ -1118,10 +1114,8 @@ Lng32 SQL_EXEC_ALLOCSTMTFORRS (
   return SQL_EXEC_AllocStmtForRS(callStmtId, resultSetIndex, resultSetStmtId);
 }
 
-//LCOV_EXCL_STOP
 
 //nowait CLI 
-//LCOV_EXCL_START 
 Lng32 SQL_EXEC_AssocFileNumber(/*IN*/ SQLSTMT_ID * statement_id,
 			      /*IN*/ short        file_number)
 {
@@ -1163,7 +1157,6 @@ Lng32 SQL_EXEC_ASSOCFILENUMBER (/*IN*/ SQLSTMT_ID * statement_id,
 {
   return SQL_EXEC_AssocFileNumber(statement_id, file_number);
 };
-//LCOV_EXCL_STOP
 
 Lng32 SQL_EXEC_ClearDiagnostics(/*IN*/ SQLSTMT_ID *statement_id)
 {
@@ -1200,7 +1193,6 @@ Lng32 SQL_EXEC_ClearDiagnostics(/*IN*/ SQLSTMT_ID *statement_id)
    retcode = RecordError(statement_id, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_CLEARDIAGNOSTICS (/*IN*/ SQLSTMT_ID *statement_id){
   return SQL_EXEC_ClearDiagnostics(statement_id);
 };
@@ -1213,7 +1205,6 @@ Lng32 SQL_EXEC_CLI_VERSION()
   return CLI_VERSION;
 }
 
-//LCOV_EXCL_STOP
 
 Lng32 SQL_EXEC_CloseStmt(/*IN*/ SQLSTMT_ID * statement_id)
 {
@@ -1251,7 +1242,6 @@ Lng32 SQL_EXEC_CloseStmt(/*IN*/ SQLSTMT_ID * statement_id)
    return retcode;
 }
 
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_CLOSESTMT (
 		/*IN*/ SQLSTMT_ID * statement_id){
   return SQL_EXEC_CloseStmt(statement_id);
@@ -1297,7 +1287,6 @@ Lng32 SQL_EXEC_CREATECONTEXT(/*OUT*/ SQLCTX_HANDLE * context_handle,
 {
   return SQL_EXEC_CreateContext(context_handle, sqlAuthId, forFutureUse);
 }
-//LCOV_EXCL_STOP
 
 Lng32 SQL_EXEC_CurrentContext(/*OUT*/ SQLCTX_HANDLE * contextHandle)
 {
@@ -1324,7 +1313,6 @@ Lng32 SQL_EXEC_CurrentContext(/*OUT*/ SQLCTX_HANDLE * contextHandle)
    retcode = RecordError(NULL, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_CURRENTCONTEXT(/*OUT*/ SQLCTX_HANDLE * contextHandle){
 
   return SQL_EXEC_CurrentContext(contextHandle);
@@ -1465,7 +1453,6 @@ Lng32 SQL_EXEC_GetUdrErrorFlags_Internal(/*OUT*/ Lng32 *udrErrorFlags)
 
    return retcode;
 }
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_SetUdrAttributes_Internal(/*IN*/ Lng32 sqlAccessMode,
 					/*IN*/ Lng32 forFutureUse)
 {
@@ -1609,12 +1596,10 @@ Lng32 SQL_EXEC_DeallocDesc(/*IN*/ SQLDESC_ID * desc_id)
    tmpSemaphore->release();
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_DEALLOCDESC (
 		/*IN*/ SQLDESC_ID * desc_id ){
   return SQL_EXEC_DeallocDesc(desc_id);
 };
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_DeallocStmt(/*IN*/ SQLSTMT_ID * statement_id)
 {
    Lng32 retcode;
@@ -1660,12 +1645,10 @@ Lng32 SQL_EXEC_DeallocStmt(/*IN*/ SQLSTMT_ID * statement_id)
    }
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_DEALLOCSTMT (
 		/*IN*/ SQLSTMT_ID * statement_id){
   return SQL_EXEC_DeallocStmt(statement_id);
 };
-//LCOV_EXCL_STOP
 
 Lng32 SQL_EXEC_DefineDesc(/*IN*/ SQLSTMT_ID * statement_id,
         /* (SQLWHAT_DESC) *IN*/       Lng32   what_descriptor,
@@ -1704,14 +1687,12 @@ Lng32 SQL_EXEC_DefineDesc(/*IN*/ SQLSTMT_ID * statement_id,
    retcode = RecordError(statement_id, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_DEFINEDESC (
 		/*IN*/ SQLSTMT_ID * statement_id,
 		/*IN* (SQLWHAT_DESC) */ Lng32 what_descriptor,
 		/*IN*/ SQLDESC_ID * sql_descriptor){
   return SQL_EXEC_DefineDesc(statement_id, what_descriptor, sql_descriptor);
 };
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_DescribeStmt(/*IN*/          SQLSTMT_ID * statement_id,
                            /*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
                            /*IN OPTIONAL*/ SQLDESC_ID * output_descriptor)
@@ -1751,7 +1732,6 @@ Lng32 SQL_EXEC_DescribeStmt(/*IN*/          SQLSTMT_ID * statement_id,
    retcode = RecordError(statement_id, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_DESCRIBESTMT (
 		/*IN*/ SQLSTMT_ID * statement_id,
 		/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -1838,7 +1818,6 @@ Lng32 SQL_EXEC_DROPCONTEXT (
   return SQL_EXEC_DropContext(context_handle);
 };
 
-//LCOV_EXCL_STOP
 
 Lng32 SQL_EXEC_Exec(/*IN*/          SQLSTMT_ID * statement_id,
                    /*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -1896,7 +1875,6 @@ Lng32 SQL_EXEC_Exec(/*IN*/          SQLSTMT_ID * statement_id,
    return retcode;
 }
 
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_EXEC (
 		/*IN*/ SQLSTMT_ID * statement_id,
 		/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -1940,7 +1918,6 @@ Lng32 SQL_EXEC_EXEC (
    return retcode;
 
 };
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_ExecClose(/*IN*/          SQLSTMT_ID * statement_id,
                         /*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
                         /*IN*/                Lng32   num_ptr_pairs,
@@ -1990,7 +1967,6 @@ Lng32 SQL_EXEC_ExecClose(/*IN*/          SQLSTMT_ID * statement_id,
 }
 
 
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_EXECCLOSE (
 		/*IN*/ SQLSTMT_ID * statement_id,
 		/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -2034,7 +2010,6 @@ Lng32 SQL_EXEC_EXECCLOSE (
    retcode = RecordError(statement_id, retcode);
    return retcode;
 };
-//LCOV_EXCL_STOP
 
 Lng32 SQL_EXEC_ExecDirect(/*IN*/          SQLSTMT_ID * statement_id,
                          /*IN*/          SQLDESC_ID * sql_source,
@@ -2136,7 +2111,6 @@ Lng32 SQL_EXEC_ExecDirect2(/*IN*/          SQLSTMT_ID * statement_id,
    retcode = RecordError(statement_id, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_EXECDIRECT (
 		/*IN*/ SQLSTMT_ID * statement_id,
 		/*IN*/ SQLDESC_ID * sql_source,
@@ -2181,7 +2155,6 @@ Lng32 SQL_EXEC_EXECDIRECT (
    retcode = RecordError(statement_id, retcode);
    return retcode;  
 };
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_ExecDirectDealloc(/*IN*/          SQLSTMT_ID * statement_id,
                                 /*IN*/          SQLDESC_ID * sql_source,
                                 /*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -2231,7 +2204,6 @@ Lng32 SQL_EXEC_ExecDirectDealloc(/*IN*/          SQLSTMT_ID * statement_id,
                          retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_EXECDIRECTDEALLOC(/*IN*/          SQLSTMT_ID * statement_id,
                                 /*IN*/          SQLDESC_ID * sql_source,
                                 /*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -2277,7 +2249,6 @@ Lng32 SQL_EXEC_EXECDIRECTDEALLOC(/*IN*/          SQLSTMT_ID * statement_id,
                          retcode);
    return retcode;
 }
-//LCOV_EXCL_STOP
 
 Lng32 SQL_EXEC_ExecFetch(/*IN*/          SQLSTMT_ID * statement_id,
                         /*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -2334,7 +2305,6 @@ Lng32 SQL_EXEC_ExecFetch(/*IN*/          SQLSTMT_ID * statement_id,
    retcode = RecordError(statement_id, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_EXECFETCH(/*IN*/          SQLSTMT_ID * statement_id,
                         /*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
                         /*IN*/                Lng32   num_ptr_pairs,
@@ -2377,7 +2347,6 @@ Lng32 SQL_EXEC_EXECFETCH(/*IN*/          SQLSTMT_ID * statement_id,
    retcode = RecordError(statement_id, retcode);
    return retcode;
 }
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_ClearExecFetchClose(/*IN*/          SQLSTMT_ID * statement_id,
 				  /*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
 				  /*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -2440,7 +2409,6 @@ Lng32 SQL_EXEC_ClearExecFetchClose(/*IN*/          SQLSTMT_ID * statement_id,
    retcode = RecordError(statement_id, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_CLEAREXECFETCHCLOSE(/*IN*/ SQLSTMT_ID * statement_id,
 				  /*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
 				  /*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -2491,7 +2459,6 @@ Lng32 SQL_EXEC_CLEAREXECFETCHCLOSE(/*IN*/ SQLSTMT_ID * statement_id,
    retcode = RecordError(statement_id, retcode);
    return retcode;
 }
-//LCOV_EXCL_STOP
 
 Lng32 SQL_EXEC_Fetch(/*IN*/          SQLSTMT_ID * statement_id,
                     /*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -2547,7 +2514,6 @@ Lng32 SQL_EXEC_Fetch(/*IN*/          SQLSTMT_ID * statement_id,
    retcode = RecordError(statement_id, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_FETCH(/*IN*/          SQLSTMT_ID * statement_id,
                     /*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
                     /*IN*/                Lng32   num_ptr_pairs,
@@ -2592,7 +2558,6 @@ Lng32 SQL_EXEC_FETCH(/*IN*/          SQLSTMT_ID * statement_id,
 
   return retcode;
 }
-//LCOV_EXCL_STOP
 
 Lng32 SQL_EXEC_FetchClose(/*IN*/          SQLSTMT_ID * statement_id,
                          /*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -2640,7 +2605,6 @@ Lng32 SQL_EXEC_FetchClose(/*IN*/          SQLSTMT_ID * statement_id,
    retcode = RecordError(statement_id, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_FETCHCLOSE(/*IN*/          SQLSTMT_ID * statement_id,
                          /*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
                          /*IN*/                Lng32   num_ptr_pairs,
@@ -2683,7 +2647,6 @@ Lng32 SQL_EXEC_FETCHCLOSE(/*IN*/          SQLSTMT_ID * statement_id,
    retcode = RecordError(statement_id, retcode);
    return retcode;
 }
-//LCOV_EXCL_STOP
 
 Lng32 SQL_EXEC_FetchMultiple(/*IN*/           SQLSTMT_ID * statement_id,
                             /*IN  OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -2737,7 +2700,6 @@ Lng32 SQL_EXEC_FetchMultiple(/*IN*/           SQLSTMT_ID * statement_id,
    retcode = RecordError(statement_id, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_FETCHMULTIPLE(/*IN*/           SQLSTMT_ID * statement_id,
                             /*IN  OPTIONAL*/ SQLDESC_ID * output_descriptor,
                             /*IN*/                 Lng32   rowset_size,
@@ -2786,7 +2748,6 @@ Lng32 SQL_EXEC_FETCHMULTIPLE(/*IN*/           SQLSTMT_ID * statement_id,
    retcode = RecordError(statement_id, retcode);
    return retcode;
 }
-//LCOV_EXCL_STOP
 
 // Called by the cancel thread.
 // Don't use getCliSemaphore(currContext)->to acquire a critical section.
@@ -2865,13 +2826,11 @@ Lng32 SQL_EXEC_GetDescEntryCount(/*IN*/ SQLDESC_ID * sql_descriptor,
    retcode = RecordError(NULL, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_GETDESCENTRYCOUNT(
 		/*IN*/ SQLDESC_ID * sql_descriptor,
 		/*IN*/ SQLDESC_ID * output_descriptor){
   return SQL_EXEC_GetDescEntryCount(sql_descriptor, output_descriptor);
 };
-//LCOV_EXCL_STOP
 
 Lng32 SQL_EXEC_GetDescEntryCountBasic(/*IN*/  SQLDESC_ID * sql_descriptor,
                                      /*OUT*/       Lng32 * num_entries)
@@ -2957,7 +2916,6 @@ Lng32 SQL_EXEC_GetDescItem(/*IN*/     SQLDESC_ID * sql_descriptor,
    retcode = RecordError(NULL, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_GETDESCITEM(
 		/*IN*/ SQLDESC_ID * sql_descriptor,
 		/*IN*/ Lng32 entry,
@@ -2978,7 +2936,6 @@ Lng32 SQL_EXEC_GETDESCITEM(
                               len_of_item,
                               start_from_offset);
 };
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_GetDescItems(/*IN*/   SQLDESC_ID * sql_descriptor,
                            /*IN*/ SQLDESC_ITEM   desc_items[],
                            /*IN*/   SQLDESC_ID * value_num_descriptor,
@@ -3020,7 +2977,6 @@ Lng32 SQL_EXEC_GetDescItems(/*IN*/   SQLDESC_ID * sql_descriptor,
    retcode = RecordError(NULL, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_GETDESCITEMS(
 		/*IN*/ SQLDESC_ID * sql_descriptor,
 		/*IN*/ SQLDESC_ITEM desc_items[],
@@ -3031,7 +2987,6 @@ Lng32 SQL_EXEC_GETDESCITEMS(
                                value_num_descriptor,
                                output_descriptor);
 };
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_GetDescItems2(/*IN*/   SQLDESC_ID * sql_descriptor,
 			    /*IN*/   Lng32 no_of_desc_items,
 			    /*IN*/ SQLDESC_ITEM   desc_items[])
@@ -3069,7 +3024,6 @@ Lng32 SQL_EXEC_GetDescItems2(/*IN*/   SQLDESC_ID * sql_descriptor,
    retcode = RecordError(NULL, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_GETDESCITEMS2(
 		/*IN*/ SQLDESC_ID * sql_descriptor,
 		/*IN*/ Lng32 no_of_desc_items,
@@ -3078,7 +3032,6 @@ Lng32 SQL_EXEC_GETDESCITEMS2(
 				no_of_desc_items,
 				desc_items);
 };
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_GetDiagnosticsStmtInfo(/*IN*/       Lng32 * stmt_info_items,
                                      /*IN*/ SQLDESC_ID * output_descriptor)
 {
@@ -3160,7 +3113,6 @@ Lng32 SQL_EXEC_GetDiagnosticsStmtInfo2(
    retcode = RecordError(statement_id, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO(
 		/*IN*/ Lng32 *stmt_info_items,
 		/*IN*/ SQLDESC_ID * output_descriptor){
@@ -3201,7 +3153,6 @@ static void copyResultString(char * dest, const char * src, Lng32 destLen,
   else
     *dest = '\0';
 }
-//LCOV_EXCL_STOP
 
 //
 // GetAutoSizedCondInfo
@@ -3798,7 +3749,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
      tmpSemaphore->release();
 
      retcode = RecordError(NULL, retcode);
-     //LCOV_EXCL_START
      if (retcode < 0) 
      {
        delete [] message_buffer_ptr;
@@ -3806,7 +3756,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
        diagsArea->deAllocate();
        return retcode;
      }
-     //LCOV_EXCL_STOP
 
      // The actual diags area resides in the context heap and is inaccessible
      // here in non-priv code. We must unpack the copy which has been
@@ -3821,7 +3770,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
      for(Int32 i=0; i<no_of_condition_items && retcode == 0; i++)
      {
        diagItemValues = diag_cond_info_item_values[i];
-       //LCOV_EXCL_START
        if (diagItemValues.num_val_or_len == NULL)
        {
 	 delete [] message_buffer_ptr;
@@ -3829,7 +3777,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
 	 diagsArea->deAllocate();
 	 return -CLI_INVALID_ATTR_VALUE;
        }
-       //LCOV_EXCL_STOP
        string_value = diagItemValues.string_val;
        max_string_len = string_value ? *(diagItemValues.num_val_or_len) : 0;
        conditionNum = diagItemValues.item_id_and_cond_number.cond_number_desc_entry;
@@ -3851,14 +3798,12 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
 	   {
 	      if(condition.getCustomSQLState() == NULL) 
 	      {
-		//LCOV_EXCL_START
 		if (max_string_len < 6) {
 		  delete [] message_buffer_ptr;
 		  diagsArea->clear();
 		  diagsArea->deAllocate();
 		  return -CLI_INVALID_ATTR_VALUE;
 		}
-		//LCOV_EXCL_STOP
 		ComSQLSTATE(condition.getSQLCODE(), string_value);
 		if (len_of_item)
 		  *len_of_item = 6;
@@ -3947,7 +3892,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
                   break;
                 } // switch
               }
-		//LCOV_EXCL_START
                 if (msgInLocaleLen == 0 && wMsgLen > 0 && max_string_len > 80)
                 {                                                               // UTF8
                   char * pMsg   = string_value;                                 // SJIS
@@ -3960,7 +3904,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
                   str_cat(pMsg, SQLCHARSETSTRING_UTF8, pMsg);
                   msgInLocaleLen = str_len(pMsg);
                 } // if (msgInLocaleLen == 0 && wMsgLen > 0 && max_string_len > 80)
-		//LCOV_EXCL_STOP
               }
 
 		if(msgInLocaleLen == 0)
@@ -3991,7 +3934,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
    return retcode;
 
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_GETDIAGNOSTICSCONDINFO3(
 		/*IN*/ Lng32 no_of_condition_items,
 		/*IN*/ SQLDIAG_COND_INFO_ITEM_VALUE
@@ -4570,7 +4512,6 @@ Lng32 SQL_EXEC_GetStmtAttr(/*IN*/ SQLSTMT_ID * statement_id,
    tmpSemaphore->release();
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_GETSTMTATTR(/*IN*/ SQLSTMT_ID * statement_id,
                           /*IN* (SQLATTR_TYPE) */ Lng32 attrName,
 			  /*OUT OPTIONAL*/      Lng32 * numeric_value,
@@ -4582,7 +4523,6 @@ Lng32 SQL_EXEC_GETSTMTATTR(/*IN*/ SQLSTMT_ID * statement_id,
 			      numeric_value, string_value,
 			      max_string_len, len_of_item);
 }
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_GetStmtAttrs(/*IN*/ SQLSTMT_ID * statement_id,
                            /*IN*/           Lng32 number_of_attrs,
                            /*INOUT*/        SQLSTMT_ATTR attrs[],
@@ -4622,7 +4562,6 @@ Lng32 SQL_EXEC_GetStmtAttrs(/*IN*/ SQLSTMT_ID * statement_id,
    tmpSemaphore->release();
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_GETSTMTATTRS(/*IN*/ SQLSTMT_ID * statement_id,
                            /*IN*/           Lng32 number_of_attrs,
                            /*INOUT*/        SQLSTMT_ATTR attrs[],
@@ -4631,7 +4570,6 @@ Lng32 SQL_EXEC_GETSTMTATTRS(/*IN*/ SQLSTMT_ID * statement_id,
   return SQL_EXEC_GetStmtAttrs(statement_id, number_of_attrs,
                                attrs, num_returned);
 }
-//LCOV_EXCL_STOP
 #ifdef __cplusplus
 extern "C"
 {
@@ -4641,7 +4579,6 @@ Lng32 SQL_EXEC_GetStatistics(/*IN OPTIONAL*/ SQLSTMT_ID * statement_id,
 {
   return -CLI_INTERNAL_ERROR;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_GETSTATISTICS(
 		/*IN OPTIONAL*/ SQLSTMT_ID * statement_id)
 {
@@ -4755,7 +4692,6 @@ Lng32 SQL_EXEC_Prepare2(/*IN*/ SQLSTMT_ID * statement_id,
    return retcode;
 }
 
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_PREPARE(
 		/*IN*/ SQLSTMT_ID * statement_id,
 		/*IN*/ SQLDESC_ID * sql_source){
@@ -4938,7 +4874,6 @@ Lng32 SQL_EXEC_RESSTMTNAME(
 
   return SQL_EXEC_ResStmtName(statement_id);
 };
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_SetCursorName(/*IN*/ SQLSTMT_ID * statement_id,
                             /*IN*/ SQLSTMT_ID * cursor_name)
 {
@@ -4976,14 +4911,12 @@ Lng32 SQL_EXEC_SetCursorName(/*IN*/ SQLSTMT_ID * statement_id,
    retcode = RecordError(statement_id, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_SETCURSORNAME(
 		/*IN*/ SQLSTMT_ID * statement_id,
 		/*IN*/ SQLSTMT_ID * cursor_name){
 
   return SQL_EXEC_SetCursorName(statement_id, cursor_name);
 };
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_SetStmtAttr(/*IN*/ SQLSTMT_ID * statement_id,
                           /*IN* (SQLATTR_TYPE) */ Lng32 attrName,
                           /*IN OPTIONAL*/       Lng32   numeric_value,
@@ -5027,7 +4960,6 @@ Lng32 SQL_EXEC_SetStmtAttr(/*IN*/ SQLSTMT_ID * statement_id,
       RecordError( statement_id, retcode );
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_SETSTMTATTR(/*IN*/ SQLSTMT_ID * statement_id,
                           /*IN* (SQLATTR_TYPE) */ Lng32 attrName,
                           /*IN OPTIONAL*/       Lng32   numeric_value,
@@ -5118,7 +5050,6 @@ Lng32 SQL_EXEC_SetDescEntryCountBasic(/*IN*/ SQLDESC_ID * sql_descriptor,
    RecordError(NULL, retcode);
    return retcode;
 }
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_SetDescItem(/*IN*/          SQLDESC_ID * sql_descriptor,
                           /*IN*/                Lng32   entry,
       /* (SQLDESC_ITEM_ID) *IN*/                Lng32   what_to_set,
@@ -5161,7 +5092,6 @@ Lng32 SQL_EXEC_SetDescItem(/*IN*/          SQLDESC_ID * sql_descriptor,
    tmpSemaphore->release();
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_SETDESCITEM(
 		/*IN*/ SQLDESC_ID * sql_descriptor,
 		/*IN*/ Lng32 entry,
@@ -5171,7 +5101,6 @@ Lng32 SQL_EXEC_SETDESCITEM(
 
   return SQL_EXEC_SetDescItem(sql_descriptor, entry, what_to_set, numeric_value, string_value);
 };
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_SetDescItems(/*IN*/   SQLDESC_ID * sql_descriptor,
                            /*IN*/ SQLDESC_ITEM   desc_items[],
                            /*IN*/   SQLDESC_ID * value_num_descriptor,
@@ -5213,7 +5142,6 @@ Lng32 SQL_EXEC_SetDescItems(/*IN*/   SQLDESC_ID * sql_descriptor,
    RecordError(NULL, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_SETDESCITEMS(
 		/*IN*/ SQLDESC_ID * sql_descriptor,
 		/*IN*/ SQLDESC_ITEM desc_items[],
@@ -5224,7 +5152,6 @@ Lng32 SQL_EXEC_SETDESCITEMS(
 
   return SQL_EXEC_SetDescItems(sql_descriptor, desc_items, value_num_descriptor, input_descriptor);
 };
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_SetDescItems2(
 		/*IN*/ SQLDESC_ID * sql_descriptor,
 		/*IN*/ Lng32 no_of_desc_items,
@@ -5263,7 +5190,6 @@ Lng32 SQL_EXEC_SetDescItems2(
    RecordError(NULL, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_SETDESCITEMS2(
 		/*IN*/ SQLDESC_ID * sql_descriptor,
 		/*IN*/ Lng32 no_of_desc_items,
@@ -5272,7 +5198,6 @@ Lng32 SQL_EXEC_SETDESCITEMS2(
 {
   return SQL_EXEC_SetDescItems2(sql_descriptor, no_of_desc_items, desc_items);
 };
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_SetDescPointers(/*IN*/ SQLDESC_ID * sql_descriptor,
                               /*IN*/       Lng32   starting_entry,
                               /*IN*/       Lng32   num_ptr_pairs,
@@ -5319,7 +5244,6 @@ Lng32 SQL_EXEC_SetDescPointers(/*IN*/ SQLDESC_ID * sql_descriptor,
   RecordError(NULL, retcode);
   return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_SETDESCPOINTERS(/*IN*/       SQLDESC_ID * sql_descriptor,
                               /*IN*/       Lng32   starting_entry,
                               /*IN*/       Lng32   num_ptr_pairs,
@@ -5362,7 +5286,6 @@ Lng32 SQL_EXEC_SETDESCPOINTERS(/*IN*/       SQLDESC_ID * sql_descriptor,
   RecordError(NULL, retcode);
   return retcode;
 }
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_SetRowsetDescPointers(SQLDESC_ID * sql_descriptor,
                                            Lng32    rowset_size,
                                            Lng32    *rowset_status_ptr,
@@ -5488,13 +5411,11 @@ Lng32 SQL_EXEC_SwitchContext(/*IN*/           SQLCTX_HANDLE   ctxt_handle,
    RecordError(NULL, retcode);
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_SWITCHCONTEXT(
 		/*IN*/ SQLCTX_HANDLE context_handle,
                 /*OUT OPTIONAL*/ SQLCTX_HANDLE * prev_context_handle){
   return SQL_EXEC_SwitchContext(context_handle, prev_context_handle);
 };
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_Xact(/*IN* (SQLTRANS_COMMAND) */       Lng32   command,
                    /*OUT OPTIONAL*/            SQLDESC_ID * transid_descriptor)
 {
@@ -5531,14 +5452,12 @@ Lng32 SQL_EXEC_Xact(/*IN* (SQLTRANS_COMMAND) */       Lng32   command,
    tmpSemaphore->release();
    return retcode;
 }
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_XACT(
 		/*IN* (SQLTRANS_COMMAND) */ Lng32 command,
 		/*OUT OPTIONAL*/ SQLDESC_ID * transid_descriptor){
 
   return SQL_EXEC_Xact(command, transid_descriptor);
 }; 
-//LCOV_EXCL_STOP
 
 Lng32 SQL_EXEC_SetAuthID(
    const char * externalUsername,
@@ -5964,7 +5883,6 @@ Lng32 SQL_EXEC_GetCollectStatsType_Internal (
 						statement_id);
    return retcode;
 }
-//LCOV_EXCL_STOP
 Lng32 SQL_EXEC_BreakEnabled_Internal (
      /*IN*/ UInt32 enabled)
 {
@@ -5974,7 +5892,6 @@ Lng32 SQL_EXEC_BreakEnabled_Internal (
 				  enabled);
    return retcode;
 } 
-//LCOV_EXCL_START
 Lng32 SQL_EXEC_SPBreakReceived_Internal (
      /*OUT*/ UInt32 *breakRecvd)
 {
@@ -5983,7 +5900,6 @@ Lng32 SQL_EXEC_SPBreakReceived_Internal (
    *breakRecvd = 0;
    return retcode;
 }
-//LCOV_EXCL_STOP
 
 // For internal use only -- do not document!
 Lng32 SQL_EXEC_SetEnviron_Internal(Lng32 propagate)
@@ -6021,7 +5937,6 @@ Lng32 SQL_EXEC_SetEnviron_Internal(Lng32 propagate)
 extern "C"
 {
 #endif
-  //LCOV_EXCL_START
 // For internal use only -- do not document!
 Lng32 SQL_EXEC_SETENVIRON_INTERNAL(Lng32 propagate)
 {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/cli/CliImplLmExtFunc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliImplLmExtFunc.cpp b/core/sql/cli/CliImplLmExtFunc.cpp
index 0ad7d38..6263b37 100644
--- a/core/sql/cli/CliImplLmExtFunc.cpp
+++ b/core/sql/cli/CliImplLmExtFunc.cpp
@@ -45,12 +45,10 @@ void lmMakeTFDSCall(const char *msg, const char *file, UInt32 line)
 }
 
 
-// LCOV_EXCL_START
 void lmPrintSignalHandlers()
 {
   // printSignalHandlers();
 }
-// LCOV_EXCL_STOP
 
 NABoolean lmSetSignalHandlersToDefault()
 {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/cli/ExSqlComp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/ExSqlComp.cpp b/core/sql/cli/ExSqlComp.cpp
index dd4a576..9d57157 100644
--- a/core/sql/cli/ExSqlComp.cpp
+++ b/core/sql/cli/ExSqlComp.cpp
@@ -128,7 +128,6 @@ ExSqlComp::ReturnStatus ExSqlComp::createServer()
   if (!(sc_=new(h_) IpcServerClass(env_, IPC_SQLCOMP_SERVER, allocMethod_,
                                    compilerVersion_,nodeName_)))
     {
-      //ss_cc_change : Rare error condition
       //
       *diagArea_ << DgSqlCode(- CLI_OUT_OF_MEMORY)
                  << DgString0("IpcServerClass");
@@ -151,7 +150,6 @@ ExSqlComp::ReturnStatus ExSqlComp::createServer()
 	  getMxcmpPriorityDelta();
       if ((priority > 200) ||
 	  (priority < 1))
-	//ss_cc_change - rare occurence
 	
 	priority = IPC_PRIORITY_DONT_CARE;
 	
@@ -171,7 +169,6 @@ ExSqlComp::ReturnStatus ExSqlComp::createServer()
       //Server process allocations may have changed the define context
       cliGlobals_->currContext()->checkAndSetCurrentDefineContext();
     }
-  //ss_cc_change : rare error condition
   //  
   if (ret == ERROR)
   {
@@ -212,7 +209,6 @@ ExSqlComp::ReturnStatus ExSqlComp::establishConnection()
     if (badConnection_)
       ret = ERROR;
   }
-    //ss_cc_change : rare error path
     //
   if (ret == ERROR)
     error(arkcmpErrorConnection);
@@ -229,12 +225,12 @@ ExSqlComp::ReturnStatus ExSqlComp::startSqlcomp(void)
 
   // all the connection and control processing are done in waited mode.
   if ( (ret=createServer()) == ERROR )
-    return ret; //LCOV_EXCL_LINE
+    return ret;
   if ( (ret=establishConnection()) == ERROR )
-    return ret; //LCOV_EXCL_LINE
+    return ret;
 
   if ( (ret=resendControls()) == ERROR )
-    return ret; //LCOV_EXCL_LINE
+    return ret;
 
   // on NT, the environment is not shipped to mxcmp when the process
   // is created as an NSK lite process.
@@ -262,7 +258,6 @@ ExSqlComp::ReturnStatus ExSqlComp::resendRequest()
   /* long sqlCode = (ta->xnInProgress() && !ta->implicitXn()) ?
      arkcmpErrorUserTxnAndArkcmpGone : 0;*/
   Lng32 sqlCode=0;
-  //ss_cc_change : debug error path
   //
   if (
 #ifdef _DEBUG
@@ -357,7 +352,6 @@ ExSqlComp::ReturnStatus ExSqlComp::sendR(CmpMessageObj* c, NABoolean w)
   short indexIntoCliCompilerArray = 0;
   indexIntoCliCompilerArray = cliGlobals_->currContext()->getIndexToCompilerArray();
 
-  //ss_cc_change : rare error condition
   //
   if (badConnection_)
     {      
@@ -372,7 +366,6 @@ ExSqlComp::ReturnStatus ExSqlComp::sendR(CmpMessageObj* c, NABoolean w)
       if (ret == ERROR)
          return ret;
     } 
-  //ss_cc_change : can only happen through nowait CLI
   //
 
   if(this->isShared() && (cliGlobals_->currContext() != lastContext_))
@@ -449,7 +442,6 @@ ExSqlComp::OperationStatus ExSqlComp::status(Int64 reqId)
 
 // --------------------------------------------------------------------------
 // Parse the info fetched from Describe::bindNode().  Genesis 10-981211-5986.
-//ss_cc_change : This is unused dead code 
 //
 static NABoolean pairLenTxt(Int32 &len, const char *&txt, const char *&cqd)
 {
@@ -485,7 +477,6 @@ void ExSqlComp::appendControls(ExControlArea *dest, ExControlArea *src){
                        ctl->isNonResettable());
     }
 }
-//ss_cc_change : This was used only for versioning - obsolete on SQ
 //
 static ExSqlComp::ReturnStatus saveControls(ExControlArea *ca, const char *cqd)
 {
@@ -601,7 +592,6 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw)   // Genesis
   ContextCli *ctxt = cliGlobals_->currContext();
   short indexIntoCliCompilerArray = ctxt->getIndexToCompilerArray();
 
-  //ss_cc_change: rare error condition
   //
   if (ctxt->arkcmpInitFailed(indexIntoCliCompilerArray))
   {
@@ -653,7 +643,6 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw)   // Genesis
     if (q->isEmpty())
     {
       ret=resetAllDefaults(); 
-      //ss_cc_change : rare error condition
       // 
       if (ret == ERROR)
       {
@@ -797,7 +786,6 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw)   // Genesis
         
         if (ret != ERROR)
         {
-	  // ss_cc_change : only applicable to downrev compiler
 	  //
           if ( 
               ((*diagArea_).contains(-2050) || 
@@ -845,7 +833,6 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw)   // Genesis
       
     } // control list is NOT empty
   } // if (ret != ERROR)
-  //ss_cc_change : rare error case
   //
   if (ret != SUCCESS || diagArea_->getNumber() || loopDiags.getNumber())
   {
@@ -982,7 +969,6 @@ ExSqlComp::~ExSqlComp()
   if (diagArea_)
     diagArea_->deAllocate();
 }
-//ss_cc_change : this is applicable to nowait cli
 //
 void ExSqlComp::endConnection()
 {
@@ -1080,7 +1066,6 @@ ExSqlComp::ReturnStatus ExSqlComp::sendRequest (Operator op,
   // When we move to v2400 and beyond, this code need to correctly
   // figure out which charsets are not understood by the downrev
   // compiler where this msg is being sent to.
-  // ss_cc_change : down rev compiler is obsolete on SQ
   //
   if (getVersion() < COM_VERS_2300)
     {
@@ -1177,7 +1162,6 @@ ExSqlComp::ReturnStatus ExSqlComp::sendRequest (Operator op,
       request->setFlags(cliGlobals_->currContext()->getSqlParserFlags()); 
       
       // If we are talking to a downrev compiler take care of the following.
-      //ss_cc_change
       //
       if ( compilerVersion_ < COM_VERS_COMPILER_VERSION)
 	{
@@ -1213,7 +1197,6 @@ ExSqlComp::ReturnStatus ExSqlComp::sendRequest (Operator op,
 		}
 	      else
 		{
-		  //ss_cc_change : rare error condition
 		  //
 		  // The second retry failed. Reset outstandingSendBuffers.
 		  outstandingSendBuffers_.ioStatus_ = ExSqlComp::FINISHED;
@@ -1386,7 +1369,6 @@ ComDiagsArea* ExSqlComp::getDiags(Int64 )
 {
   return diagArea_;
 }
-//ss_cc_change : dead code
 //
 ComDiagsArea* ExSqlComp::takeDiags(Int64)
 {