Merge branch 'master' of github.com:apache/trafodion into trafodion-2963
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/a9723491 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/a9723491 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/a9723491 Branch: refs/heads/master Commit: a9723491f1c4aadb45f307b3fb46dcfe973d510f Parents: e7624aa 072708f Author: selvaganesang <selva.govindara...@esgyn.com> Authored: Wed Jun 27 21:53:37 2018 +0000 Committer: selvaganesang <selva.govindara...@esgyn.com> Committed: Wed Jun 27 21:53:37 2018 +0000 ---------------------------------------------------------------------- .rat-excludes | 3 +- NOTICE | 2 +- RAT_README | 3 +- .../jdbc/t4/CONNECTION_CONTEXT_def.java | 1 + .../java/org/trafodion/jdbc/t4/Certificate.java | 4 +- .../main/java/org/trafodion/jdbc/t4/Cipher.java | 8 +- .../trafodion/jdbc/t4/ExtractLobMessage.java | 13 +- .../org/trafodion/jdbc/t4/ExtractLobReply.java | 23 +- .../jdbc/t4/InitializeDialogueMessage.java | 3 +- .../trafodion/jdbc/t4/InterfaceConnection.java | 7 +- .../trafodion/jdbc/t4/InterfaceResultSet.java | 109 +- .../trafodion/jdbc/t4/InterfaceStatement.java | 54 +- .../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 + .../org/trafodion/jdbc/t4/T4Properties.java | 80 +- .../java/org/trafodion/jdbc/t4/TRANSPORT.java | 1 + .../java/org/trafodion/jdbc/t4/TrafT4Blob.java | 11 - .../java/org/trafodion/jdbc/t4/TrafT4Clob.java | 13 - .../java/org/trafodion/jdbc/t4/TrafT4Lob.java | 39 +- .../jdbc/t4/TrafT4PreparedStatement.java | 21 +- .../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 8 +- .../org/trafodion/jdbc/t4/TrafT4Statement.java | 4 +- .../jdbc_type2/native/SQLMXCommonFunctions.cpp | 9 + .../org/apache/trafodion/jdbc/t2/SQLMXDesc.java | 2 +- .../jdbc/t2/SQLMXPreparedStatement.java | 24 +- core/conn/odbc/src/odbc/Common/Global.h | 18 +- core/conn/odbc/src/odbc/Common/Listener.h | 9 +- .../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 | 7 +- .../nsksrvr/Interface/marshalingsrvr_srvr.cpp | 48 +- .../nsksrvr/Interface/marshalingsrvr_srvr.h | 6 +- .../src/odbc/nsksrvr/Interface/odbcs_srvr.cpp | 12 +- .../odbc/nsksrvr/Interface/odbcs_srvr_res.cpp | 18 +- .../src/odbc/nsksrvr/Interface/odbcs_srvr_res.h | 6 +- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 348 +- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h | 3 +- core/conn/odbc/src/odbc/nsksrvr/SrvrMain.cpp | 107 +- core/conn/odbc/src/odbc/nsksrvrcore/Makefile | 2 +- .../conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h | 5 +- .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 366 +- core/conn/trafci/install/Installer.java-tmpl | 8 + .../java/org/trafodion/ci/SessionInterface.java | 2 + .../odbc/odbcclient/unixcli/cli/chandle.cpp | 5 +- .../odbc/odbcclient/unixcli/cli/ctosqlconv.cpp | 4 +- .../unixcli/cli/sqlexportfunc_drvr.cpp | 470 +- .../odbcclient/unixcli/cli/sqlexportfunc_drvr.h | 367 ++ core/sqf/commonLogger/CommonLogger.cpp | 3 + core/sqf/conf/log4cxx.monitor.trafns.config | 45 + .../export/include/common/evl_sqlog_eventnum.h | 143 +- core/sqf/export/include/seabed/int/thread.inl | 3 + core/sqf/export/include/seabed/ms.h | 9 + core/sqf/export/include/trafconf/trafconfig.h | 25 +- core/sqf/macros.gmk | 9 + core/sqf/monitor/linux/cluster.cxx | 2264 +++++-- core/sqf/monitor/linux/cluster.h | 90 +- core/sqf/monitor/linux/commaccept.cxx | 168 +- core/sqf/monitor/linux/config.cxx | 416 +- core/sqf/monitor/linux/config.h | 25 +- core/sqf/monitor/linux/device.h | 2 + core/sqf/monitor/linux/healthcheck.cxx | 119 +- core/sqf/monitor/linux/healthcheck.h | 5 + core/sqf/monitor/linux/internal.h | 99 +- core/sqf/monitor/linux/lnode.cxx | 47 +- core/sqf/monitor/linux/lnode.h | 3 +- core/sqf/monitor/linux/localio.h | 7 +- core/sqf/monitor/linux/makefile | 79 +- 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.h | 2 + core/sqf/monitor/linux/monmemlog.cxx | 11 + core/sqf/monitor/linux/monsonar.h | 18 + core/sqf/monitor/linux/montrace.cxx | 24 +- core/sqf/monitor/linux/montrace.h | 44 +- core/sqf/monitor/linux/msgdef.h | 207 +- 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/pnode.cxx | 788 ++- core/sqf/monitor/linux/pnode.h | 61 +- core/sqf/monitor/linux/process.cxx | 1570 ++++- core/sqf/monitor/linux/process.h | 109 +- core/sqf/monitor/linux/pstartd.cxx | 1 + 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 | 100 +- core/sqf/monitor/linux/redirector.h | 2 + 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/reqget.cxx | 2 +- core/sqf/monitor/linux/reqkill.cxx | 152 +- core/sqf/monitor/linux/reqnewproc.cxx | 71 +- core/sqf/monitor/linux/reqnodeadd.cxx | 3 +- 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 | 64 +- core/sqf/monitor/linux/reqprocinfo.cxx | 612 +- core/sqf/monitor/linux/reqqueue.cxx | 2312 +++++-- core/sqf/monitor/linux/reqqueue.h | 590 +- core/sqf/monitor/linux/reqtmleader.cxx | 36 + core/sqf/monitor/linux/reqworker.cxx | 6 +- core/sqf/monitor/linux/shell.cxx | 1779 ++++-- core/sqf/monitor/linux/system.cxx | 2 +- core/sqf/monitor/linux/tmsync.cxx | 39 +- core/sqf/monitor/linux/versns.cxx | 30 + core/sqf/monitor/linux/zclient.cxx | 465 +- 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 | 33 + core/sqf/sql/scripts/analyzeMessageGuide.py | 4 +- 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/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 | 30 +- core/sqf/sql/scripts/install_traf_components | 5 +- core/sqf/sql/scripts/monitor.env | 2 + 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 | 17 +- core/sqf/sql/scripts/sqconfigdb.pm | 47 + core/sqf/sql/scripts/sqgen | 211 +- core/sqf/sql/scripts/sqnameserver.pm | 151 + core/sqf/sql/scripts/sqnodes.pm | 4 +- core/sqf/sql/scripts/sqpersist.pm | 4 +- core/sqf/sql/scripts/sqstart | 213 +- core/sqf/sql/scripts/sqstop | 36 +- core/sqf/sql/scripts/traf_pkill | 2 +- core/sqf/src/seabed/src/Makefile | 20 +- core/sqf/src/seabed/src/labelmaps.cpp | 29 + 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/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 | 76 + .../generated/SsccRegionProtos.java | 1 + .../generated/TrxRegionProtos.java | 1525 ++++- .../hbase-trx/src/main/protobuf/TrxRegion.proto | 13 + .../tm/hbasetmlib2/javaobjectinterfacetm.cpp | 3 +- .../tm/hbasetmlib2/javaobjectinterfacetm.h | 1 + .../sqf/src/seatrans/tm/hbasetmlib2/testrun.cpp | 2 +- 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 | 10 +- core/sqf/src/trafconf/clusterconf.cpp | 57 + core/sqf/src/trafconf/clusterconf.h | 4 + core/sqf/src/trafconf/nameserverconfig.cpp | 350 + core/sqf/src/trafconf/nameserverconfig.h | 79 + core/sqf/src/trafconf/persistconfig.cpp | 3 + core/sqf/src/trafconf/tcdb.cpp | 44 + core/sqf/src/trafconf/tcdb.h | 4 + core/sqf/src/trafconf/tcdbsqlite.cpp | 342 +- core/sqf/src/trafconf/tcdbsqlite.h | 4 + core/sqf/src/trafconf/tcdbstore.h | 4 + core/sqf/src/trafconf/tctrace.cpp | 5 +- core/sqf/src/trafconf/tctrace.h | 4 +- core/sqf/src/trafconf/trafconf.cpp | 221 +- core/sqf/src/trafconf/trafconfig.cpp | 56 + core/sql/arkcmp/CmpConnection.cpp | 12 +- core/sql/arkcmp/CmpContext.cpp | 69 +- core/sql/arkcmp/CmpContext.h | 5 +- core/sql/arkcmp/CmpStatement.cpp | 50 +- core/sql/arkcmp/CmpStatement.h | 13 +- core/sql/bin/SqlciErrors.txt | 29 +- core/sql/cli/Cli.cpp | 326 +- core/sql/cli/Cli.h | 8 +- core/sql/cli/CliExtern.cpp | 122 + core/sql/cli/Context.cpp | 278 +- core/sql/cli/Context.h | 34 +- core/sql/cli/Descriptor.cpp | 4 +- core/sql/cli/ExSqlComp.cpp | 21 +- core/sql/cli/Globals.cpp | 23 +- core/sql/cli/Globals.h | 10 +- core/sql/cli/SessionDefaults.cpp | 4 +- core/sql/cli/Statement.cpp | 25 +- core/sql/comexe/ComCompressionInfo.cpp | 84 + core/sql/comexe/ComCompressionInfo.h | 91 + core/sql/comexe/ComTdb.cpp | 6 - core/sql/comexe/ComTdb.h | 1 - core/sql/comexe/ComTdbBlockingHdfsScan.h | 1 - core/sql/comexe/ComTdbExeUtil.cpp | 190 +- core/sql/comexe/ComTdbExeUtil.h | 226 +- core/sql/comexe/ComTdbFastTransport.cpp | 1 + core/sql/comexe/ComTdbFastTransport.h | 7 +- core/sql/comexe/ComTdbHdfsScan.cpp | 1 + core/sql/comexe/ComTdbHdfsScan.h | 25 +- core/sql/common/BaseTypes.cpp | 3 +- core/sql/common/CharType.cpp | 2 +- core/sql/common/CharType.h | 27 +- core/sql/common/ComAnsiNamePart.cpp | 24 + core/sql/common/ComAnsiNamePart.h | 2 + core/sql/common/ComDistribution.cpp | 1 + core/sql/common/ComMisc.cpp | 47 + core/sql/common/ComMisc.h | 14 + core/sql/common/ComObjectName.cpp | 7 +- core/sql/common/ComResWords.cpp | 2 - core/sql/common/ComRtUtils.cpp | 3 +- core/sql/common/ComSecurityKey.cpp | 114 +- core/sql/common/ComSecurityKey.h | 5 +- core/sql/common/ComSmallDefs.h | 42 +- core/sql/common/ComUser.cpp | 2 +- core/sql/common/DTICommonType.cpp | 12 + core/sql/common/DateTimeType.cpp | 28 +- core/sql/common/DatetimeType.h | 5 +- core/sql/common/ExprNode.cpp | 21 +- core/sql/common/IntervalType.cpp | 14 +- core/sql/common/IntervalType.h | 3 +- core/sql/common/NAString.cpp | 30 +- core/sql/common/NAType.cpp | 24 +- core/sql/common/NAType.h | 5 +- core/sql/common/OperTypeEnum.h | 9 + core/sql/common/Platform.h | 2 + core/sql/executor/ExCancel.cpp | 9 +- core/sql/executor/ExComTdb.cpp | 7 - core/sql/executor/ExExeUtil.h | 292 +- core/sql/executor/ExExeUtilCli.cpp | 170 +- core/sql/executor/ExExeUtilCli.h | 22 +- core/sql/executor/ExExeUtilCommon.cpp | 50 +- core/sql/executor/ExExeUtilExplain.cpp | 48 +- core/sql/executor/ExExeUtilGet.cpp | 1259 ++-- core/sql/executor/ExExeUtilGetStats.cpp | 20 +- core/sql/executor/ExExeUtilLoad.cpp | 677 +- core/sql/executor/ExExeUtilMisc.cpp | 1286 +--- core/sql/executor/ExExeUtilVolTab.cpp | 29 +- core/sql/executor/ExExplain.cpp | 6 +- core/sql/executor/ExFastTransport.cpp | 126 +- core/sql/executor/ExFastTransport.h | 5 +- core/sql/executor/ExHbaseAccess.cpp | 60 +- core/sql/executor/ExHbaseAccess.h | 32 +- core/sql/executor/ExHbaseIUD.cpp | 58 +- core/sql/executor/ExHdfsScan.cpp | 475 +- core/sql/executor/ExHdfsScan.h | 94 +- core/sql/executor/ExSMCommon.cpp | 1 + core/sql/executor/ExSMCommon.h | 3 +- core/sql/executor/ExSMGlobals.cpp | 1 + core/sql/executor/ExSMQueue.cpp | 2 +- core/sql/executor/ExSMReader.cpp | 1 + core/sql/executor/ExSMShortMessage.cpp | 2 +- core/sql/executor/ExSMTaskList.cpp | 2 +- core/sql/executor/ExStats.cpp | 2 +- core/sql/executor/HBaseClient_JNI.cpp | 1031 +-- core/sql/executor/HBaseClient_JNI.h | 127 +- core/sql/executor/HdfsClient_JNI.cpp | 1070 ++++ core/sql/executor/HdfsClient_JNI.h | 239 + core/sql/executor/HiveClient_JNI.cpp | 537 ++ core/sql/executor/HiveClient_JNI.h | 113 + core/sql/executor/JavaObjectInterface.cpp | 165 +- core/sql/executor/JavaObjectInterface.h | 51 +- core/sql/executor/OrcFileReader.cpp | 26 +- core/sql/executor/OrcFileReader.h | 2 +- core/sql/executor/SequenceFileReader.cpp | 365 +- core/sql/executor/SequenceFileReader.h | 34 +- core/sql/executor/ex_control.cpp | 5 +- core/sql/executor/ex_ddl.cpp | 25 +- core/sql/executor/ex_hash_grby.cpp | 12 +- core/sql/executor/ex_root.cpp | 84 +- core/sql/executor/hiveHook.cpp | 99 +- .../sql/executor/org_trafodion_sql_HDFSClient.h | 31 + core/sql/executor/sql_buffer.cpp | 5 +- core/sql/executor/sql_buffer.h | 4 +- core/sql/exp/ExpConvMxcs.cpp | 2 +- core/sql/exp/ExpError.cpp | 14 + core/sql/exp/ExpError.h | 9 + core/sql/exp/ExpErrorEnums.h | 5 +- core/sql/exp/ExpHbaseDefs.h | 1 + core/sql/exp/ExpHbaseInterface.cpp | 98 +- core/sql/exp/ExpHbaseInterface.h | 20 +- core/sql/exp/ExpLOB.cpp | 131 +- core/sql/exp/ExpLOB.h | 15 +- core/sql/exp/ExpLOBaccess.cpp | 172 +- core/sql/exp/ExpLOBaccess.h | 8 - core/sql/exp/ExpLOBenums.h | 2 +- core/sql/exp/ExpLOBexternal.h | 4 +- core/sql/exp/ExpLOBinterface.cpp | 7 +- core/sql/exp/ExpLOBinterface.h | 23 +- core/sql/exp/ExpPCodeClauseGen.cpp | 8 + core/sql/exp/ExpPackDefs.cpp | 10 + core/sql/exp/ExpSqlTupp.h | 14 +- core/sql/exp/exp_arith.cpp | 444 +- core/sql/exp/exp_attrs.cpp | 14 +- core/sql/exp/exp_attrs.h | 8 +- core/sql/exp/exp_bignum.cpp | 14 + core/sql/exp/exp_bignum.h | 17 +- core/sql/exp/exp_clause.cpp | 19 + core/sql/exp/exp_clause.h | 4 +- core/sql/exp/exp_clause_derived.h | 14 +- core/sql/exp/exp_conv.cpp | 6 + core/sql/exp/exp_datetime.cpp | 243 +- core/sql/exp/exp_datetime.h | 12 +- core/sql/exp/exp_fixup.cpp | 6 +- core/sql/exp/exp_function.cpp | 450 +- core/sql/exp/exp_function.h | 90 +- core/sql/export/ComDiags.cpp | 11 + core/sql/export/ComDiags.h | 10 +- core/sql/generator/GenExpGenerator.cpp | 25 +- core/sql/generator/GenExpGenerator.h | 9 +- core/sql/generator/GenExplain.cpp | 83 +- core/sql/generator/GenFastTransport.cpp | 14 +- core/sql/generator/GenItemExpr.cpp | 2 + core/sql/generator/GenItemFunc.cpp | 33 +- core/sql/generator/GenPreCode.cpp | 30 +- core/sql/generator/GenRelExeUtil.cpp | 497 +- core/sql/generator/GenRelJoin.cpp | 8 +- core/sql/generator/GenRelPackedRows.cpp | 7 +- core/sql/generator/GenRelScan.cpp | 33 +- core/sql/generator/GenRelUpdate.cpp | 6 +- core/sql/generator/GenShape.cpp | 7 + core/sql/generator/Generator.cpp | 10 +- core/sql/generator/Generator.h | 4 +- core/sql/langman/LmLangManagerJava.cpp | 4 +- .../java/org/trafodion/libmgmt/JDBCUDR.java | 721 +++ core/sql/nskgmake/comexe/Makefile | 3 +- core/sql/nskgmake/executor/Makefile | 2 + core/sql/nskgmake/sqlcomp/Makefile | 1 + core/sql/nskgmake/tdm_sqlexp/Makefile | 2 +- core/sql/nskgmake/udr_predef/Makefile | 1 + core/sql/optimizer/BindItemExpr.cpp | 555 +- core/sql/optimizer/BindRelExpr.cpp | 183 +- core/sql/optimizer/ColStatDesc.cpp | 4 + core/sql/optimizer/ControlDB.cpp | 10 + core/sql/optimizer/GroupAttr.cpp | 7 +- core/sql/optimizer/GroupAttr.h | 15 +- core/sql/optimizer/HDFSHook.cpp | 35 +- core/sql/optimizer/HDFSHook.h | 16 +- core/sql/optimizer/ImplRule.h | 64 - core/sql/optimizer/Inlining.cpp | 19 +- core/sql/optimizer/ItemCache.cpp | 8 + core/sql/optimizer/ItemExpr.cpp | 49 +- core/sql/optimizer/ItemExprList.cpp | 11 + core/sql/optimizer/ItemFunc.h | 116 +- core/sql/optimizer/NATable.cpp | 61 +- core/sql/optimizer/NATable.h | 42 +- core/sql/optimizer/NormRelExpr.cpp | 85 +- core/sql/optimizer/ObjectNames.cpp | 9 +- core/sql/optimizer/ObjectNames.h | 1 + core/sql/optimizer/OptItemExpr.cpp | 2 + core/sql/optimizer/OptPhysRelExpr.cpp | 2 +- core/sql/optimizer/OptimizerSimulator.cpp | 50 +- core/sql/optimizer/PartFunc.cpp | 52 +- core/sql/optimizer/QRDescGenerator.cpp | 15 +- core/sql/optimizer/RelCache.cpp | 4 - core/sql/optimizer/RelExeUtil.cpp | 354 +- core/sql/optimizer/RelExeUtil.h | 194 +- core/sql/optimizer/RelExpr.cpp | 77 +- core/sql/optimizer/RelFastTransport.cpp | 75 +- core/sql/optimizer/RelMisc.h | 5 +- core/sql/optimizer/RelRoutine.cpp | 9 + core/sql/optimizer/RelScan.h | 18 +- core/sql/optimizer/RelSet.h | 2 +- core/sql/optimizer/RelUpdate.h | 15 - core/sql/optimizer/Rule.cpp | 2 + core/sql/optimizer/ScanOptimizer.cpp | 72 +- core/sql/optimizer/SynthType.cpp | 83 +- core/sql/optimizer/ValueDesc.cpp | 86 +- core/sql/optimizer/hiveHook.h | 27 +- core/sql/optimizer/mdam.cpp | 30 +- core/sql/parser/AllStmtDDL.h | 2 + core/sql/parser/ElemDDLCol.cpp | 41 +- core/sql/parser/ElemDDLColDef.h | 9 + core/sql/parser/ElemDDLColDefault.h | 17 + core/sql/parser/ElemDDLConstraintPK.h | 23 +- core/sql/parser/ElemDDLLikeOptions.cpp | 1 - core/sql/parser/ElemDDLNode.cpp | 6 + core/sql/parser/ElemDDLNode.h | 3 +- core/sql/parser/ParDDLLikeOpts.cpp | 1 + core/sql/parser/ParDDLLikeOptsCreateTable.h | 13 + core/sql/parser/ParKeyWords.cpp | 5 +- core/sql/parser/SqlParserAux.cpp | 71 +- core/sql/parser/SqlParserAux.h | 6 +- core/sql/parser/StmtDDLCleanupObjects.h | 4 +- core/sql/parser/StmtDDLCommentOn.h | 1 + core/sql/parser/StmtDDLCreate.cpp | 47 +- core/sql/parser/StmtDDLCreateTable.h | 8 + core/sql/parser/StmtDDLCreateView.h | 7 + core/sql/parser/StmtDDLDrop.cpp | 3 +- core/sql/parser/StmtDDLDropView.h | 6 + core/sql/parser/StmtDDLMisc.cpp | 2 - core/sql/parser/StmtDDLRegOrUnregHive.cpp | 4 +- core/sql/parser/StmtDDLRegOrUnregHive.h | 6 +- core/sql/parser/StmtDDLonHiveObjects.h | 189 + core/sql/parser/sqlparser.y | 1535 ++--- core/sql/parser/ulexer.cpp | 25 +- core/sql/qmscommon/QRLogger.cpp | 3 +- core/sql/qmscommon/QRLogger.h | 1 + .../sql/regress/compGeneral/DIFF006.KNOWN.SB.OS | 12 - core/sql/regress/compGeneral/EXPECTED006.SB | 63 +- core/sql/regress/compGeneral/EXPECTED015.SB | 18 +- core/sql/regress/compGeneral/EXPECTED042 | 139 +- core/sql/regress/compGeneral/EXPECTED071 | 4 +- core/sql/regress/compGeneral/EXPECTED072 | 19 +- core/sql/regress/compGeneral/EXPECTEDTOK | 12 +- core/sql/regress/compGeneral/EXPECTEDTOK2 | 7 +- core/sql/regress/compGeneral/FILTERTOK | 31 + core/sql/regress/compGeneral/TEST006 | 1 + core/sql/regress/compGeneral/TEST072 | 5 +- core/sql/regress/compGeneral/TESTTOK | 21 + core/sql/regress/compGeneral/TESTTOK.sh | 51 + core/sql/regress/core/DIFF038.KNOWN.LINUX | 3 + core/sql/regress/core/EXPECTED000.SB | 8 +- core/sql/regress/core/EXPECTED002.LINUX | 162 +- core/sql/regress/core/EXPECTED005.SB | 4 +- core/sql/regress/core/EXPECTED037.SB | 39 +- core/sql/regress/core/EXPECTED038.LINUX | 26 +- core/sql/regress/core/EXPECTED056.SB | 6 + core/sql/regress/core/EXPECTED116 | 203 +- core/sql/regress/core/EXPECTED131 | 8 +- core/sql/regress/core/EXPECTED162 | 762 +-- core/sql/regress/core/EXPECTED163 | 63 + core/sql/regress/core/TEST000 | 22 +- core/sql/regress/core/TEST002 | 61 + core/sql/regress/core/TEST037 | 20 + core/sql/regress/core/TEST038 | 2 +- core/sql/regress/core/TEST056 | 2 + core/sql/regress/core/TEST131 | 4 +- core/sql/regress/core/TEST163 | 115 + core/sql/regress/executor/DIFF001.KNOWN.SB | 9 +- core/sql/regress/executor/EXPECTED001 | 3 +- core/sql/regress/executor/EXPECTED002.SB | 64 + core/sql/regress/executor/EXPECTED012 | 598 +- core/sql/regress/executor/EXPECTED013.SB | 9 +- core/sql/regress/executor/EXPECTED016.SB | 20 +- core/sql/regress/executor/EXPECTED020 | 4 + core/sql/regress/executor/EXPECTED022.SB | 6043 ++---------------- core/sql/regress/executor/EXPECTED063 | 24 +- core/sql/regress/executor/EXPECTED122 | 27 +- core/sql/regress/executor/FILTER002 | 3 + core/sql/regress/executor/TEST002 | 33 + core/sql/regress/executor/TEST012 | 103 +- core/sql/regress/executor/TEST013 | 2 +- core/sql/regress/executor/TEST016 | 7 +- core/sql/regress/executor/TEST022 | 1088 ++-- core/sql/regress/executor/TEST063 | 3 +- core/sql/regress/executor/TEST122 | 5 +- core/sql/regress/hive/DIFF002.KNOWN | 14 + core/sql/regress/hive/DIFF003.KNOWN | 10 +- core/sql/regress/hive/DIFF008.KNOWN | 7 + core/sql/regress/hive/DIFF009.KNOWN | 3 + core/sql/regress/hive/EXPECTED001 | 762 +-- core/sql/regress/hive/EXPECTED003 | 8 +- core/sql/regress/hive/EXPECTED004 | 28 +- core/sql/regress/hive/EXPECTED005 | 226 +- core/sql/regress/hive/EXPECTED007 | 316 +- core/sql/regress/hive/EXPECTED008 | 1289 ++++ core/sql/regress/hive/EXPECTED009 | 136 +- core/sql/regress/hive/EXPECTED017 | 15 +- core/sql/regress/hive/EXPECTED018 | 838 ++- core/sql/regress/hive/EXPECTED030 | 2902 --------- core/sql/regress/hive/EXPECTED040 | 2527 -------- core/sql/regress/hive/FILTER002 | 33 + core/sql/regress/hive/FILTER005 | 1 + core/sql/regress/hive/FILTER008 | 36 + 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 | 338 + 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 | 805 +++ core/sql/regress/privs1/EXPECTED125 | 1005 ++- core/sql/regress/privs1/EXPECTED137 | 31 +- core/sql/regress/privs1/EXPECTED141 | 3 +- core/sql/regress/privs1/TEST120 | 28 +- core/sql/regress/privs1/TEST123 | 46 + core/sql/regress/privs1/TEST125 | 71 +- core/sql/regress/privs1/TEST137 | 23 +- core/sql/regress/privs1/TEST141 | 3 + core/sql/regress/privs2/EXPECTED129 | 36 +- core/sql/regress/privs2/EXPECTED135 | 15 +- core/sql/regress/privs2/EXPECTED138 | 6 +- core/sql/regress/privs2/EXPECTED140 | 16 +- core/sql/regress/privs2/EXPECTED143 | 16 +- core/sql/regress/privs2/EXPECTED144 | 329 +- core/sql/regress/privs2/EXPECTED146 | 1773 +++++ 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/seabase/EXPECTED002 | 388 +- core/sql/regress/seabase/EXPECTED003 | 6 +- core/sql/regress/seabase/EXPECTED010 | 3 + core/sql/regress/seabase/EXPECTED020 | 139 +- core/sql/regress/seabase/EXPECTED022 | 129 +- core/sql/regress/seabase/EXPECTED026 | 34 +- core/sql/regress/seabase/EXPECTED030 | 14 + core/sql/regress/seabase/EXPECTED031 | 75 +- core/sql/regress/seabase/EXPECTED032 | 248 +- core/sql/regress/seabase/FILTER002 | 7 +- core/sql/regress/seabase/TEST002 | 42 +- core/sql/regress/seabase/TEST020 | 42 +- core/sql/regress/seabase/TEST022 | 11 + core/sql/regress/seabase/TEST026 | 4 +- core/sql/regress/seabase/TEST026_drop_hbase | 26 + core/sql/regress/seabase/TEST030 | 4 + core/sql/regress/seabase/TEST031 | 20 +- core/sql/regress/seabase/TEST032 | 56 + 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 | 18 +- 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 | 5 + core/sql/regress/tools/runregr_privs2.ksh | 5 + 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/EXPECTED002 | 97 +- core/sql/regress/udr/EXPECTED100.SB | 26 +- core/sql/regress/udr/EXPECTED102 | 2 + core/sql/regress/udr/TEST002 | 58 +- core/sql/regress/udr/TEST100 | 13 +- core/sql/regress/udr/t100.java | 4 + core/sql/runtimestats/SqlStats.cpp | 22 +- core/sql/runtimestats/SqlStats.h | 3 + core/sql/runtimestats/rts_msg.cpp | 39 + core/sql/runtimestats/rts_msg.h | 40 +- core/sql/runtimestats/sscpipc.cpp | 61 + core/sql/runtimestats/sscpipc.h | 1 + core/sql/runtimestats/ssmpipc.cpp | 89 +- core/sql/runtimestats/ssmpipc.h | 7 +- core/sql/sort/SortError.h | 2 +- core/sql/sqlci/Param.cpp | 8 +- core/sql/sqlci/Param.h | 2 +- core/sql/sqlci/SqlCmd.cpp | 127 +- core/sql/sqlci/SqlciCmd.cpp | 6 +- core/sql/sqlci/sqlci_lex.ll | 2 - core/sql/sqlci/sqlci_yacc.y | 11 - core/sql/sqlci/sqlcmd.h | 8 +- core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 3 +- core/sql/sqlcomp/CmpDescribe.cpp | 228 +- core/sql/sqlcomp/CmpDescribe.h | 60 +- core/sql/sqlcomp/CmpMain.cpp | 8 +- core/sql/sqlcomp/CmpSeabaseDDL.h | 58 +- core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 70 +- core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 185 +- core/sql/sqlcomp/CmpSeabaseDDLcleanup.h | 5 +- core/sql/sqlcomp/CmpSeabaseDDLcommentOn.cpp | 45 +- core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 323 +- core/sql/sqlcomp/CmpSeabaseDDLindex.cpp | 8 + core/sql/sqlcomp/CmpSeabaseDDLmd.h | 4 +- core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 181 +- core/sql/sqlcomp/CmpSeabaseDDLroutine.h | 99 +- core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 26 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 1547 ++++- core/sql/sqlcomp/CmpSeabaseDDLutil.cpp | 6 + core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 20 + core/sql/sqlcomp/DefaultConstants.h | 54 +- core/sql/sqlcomp/PrivMgr.cpp | 9 + core/sql/sqlcomp/PrivMgr.h | 4 + core/sql/sqlcomp/PrivMgrCommands.cpp | 160 +- core/sql/sqlcomp/PrivMgrCommands.h | 360 +- core/sql/sqlcomp/PrivMgrComponentPrivileges.cpp | 18 +- core/sql/sqlcomp/PrivMgrComponentPrivileges.h | 4 +- core/sql/sqlcomp/PrivMgrMDTable.cpp | 4 +- core/sql/sqlcomp/PrivMgrPrivileges.cpp | 142 +- core/sql/sqlcomp/PrivMgrPrivileges.h | 7 + core/sql/sqlcomp/PrivMgrRoles.cpp | 34 + core/sql/sqlcomp/PrivMgrUserPrivs.cpp | 208 + core/sql/sqlcomp/PrivMgrUserPrivs.h | 400 ++ core/sql/sqlcomp/QCache.cpp | 17 + core/sql/sqlcomp/nadefaults.cpp | 106 +- core/sql/sqlcomp/parser.cpp | 121 +- core/sql/sqlcomp/parser.h | 105 + core/sql/sqludr/SqlUdrPredefSeries.cpp | 112 + .../java/org/trafodion/sql/HBaseClient.java | 120 +- .../main/java/org/trafodion/sql/HDFSClient.java | 679 ++ .../java/org/trafodion/sql/HTableClient.java | 16 +- .../main/java/org/trafodion/sql/HdfsScan.java | 345 + .../main/java/org/trafodion/sql/HiveClient.java | 175 +- .../org/trafodion/sql/SequenceFileWriter.java | 154 - .../org/trafodion/sql/TrafConfiguration.java | 1 + .../java/org/trafodion/sql/TrafRegionStats.java | 13 +- .../java/org/trafodion/sql/udr/LmT2Driver.java | 12 + .../java/org/trafodion/sql/udr/TypeInfo.java | 18 +- .../org/trafodion/sql/udr/predef/JDBCUDR.java | 33 +- core/sql/udrserv/udrdefs.h | 39 +- core/sql/ustat/hs_cli.cpp | 3 +- core/sql/ustat/hs_globals.cpp | 22 +- core/sql/ustat/hs_la.cpp | 6 +- core/sql/ustat/hs_log.cpp | 2 +- core/sql/ustat/hs_log.h | 1 + core/sql/ustat/hs_parser.cpp | 13 - dcs/bin/dcs-config.sh | 14 +- dcs/bin/dcs-daemon.sh | 48 +- 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 .../main/asciidoc/_chapters/configuration.adoc | 220 +- .../main/java/org/trafodion/dcs/Constants.java | 30 +- .../org/trafodion/dcs/server/ServerManager.java | 44 +- dcs/src/main/resources/dcs-default.xml | 39 + .../org/trafodion/jdbc_test/JdbcCommon.java | 27 +- .../java/org/trafodion/jdbc_test/PropTest.java | 9 +- .../java/org/trafodion/jdbc_test/TestBlob.java | 16 +- .../org/trafodion/jdbc_test/TestBlobBatch.java | 12 +- .../java/org/trafodion/jdbc_test/TestClob.java | 17 +- .../org/trafodion/jdbc_test/TestClobBatch.java | 15 +- .../org/trafodion/jdbc_test/TestForeignKey.java | 87 +- .../org/trafodion/jdbc_test/TestGetColumns.java | 260 + .../trafodion/jdbc_test/TestGetIndexInfo.java | 24 +- .../src/asciidoc/_chapters/odbc_windows.adoc | 18 +- .../src/asciidoc/_chapters/preparation.adoc | 2 + .../src/asciidoc/_chapters/commands.adoc | 2 +- .../src/asciidoc/_chapters/binder_msgs.adoc | 30 + .../src/asciidoc/_chapters/ddl_msgs.adoc | 38 +- .../src/asciidoc/_chapters/ambari_install.adoc | 4 +- .../src/asciidoc/_chapters/introduction.adoc | 10 +- .../src/asciidoc/_chapters/introduction.adoc | 11 +- .../sql_functions_and_expressions.adoc | 1047 ++- .../src/asciidoc/_chapters/sql_statements.adoc | 946 ++- .../src/asciidoc/_chapters/sql_utilities.adoc | 2 +- docs/src/site/markdown/documentation.md | 21 + docs/src/site/markdown/download.md | 146 +- docs/src/site/markdown/release-notes-2-2-0.md | 539 ++ docs/src/site/markdown/release-notes.md | 1 + docs/src/site/site.xml | 8 + .../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/hdfs_cmds.py | 2 +- install/python-installer/scripts/traf_start.py | 8 + win-odbc64/odbcclient/drvr35/ctosqlconv.cpp | 4 +- 752 files changed, 58814 insertions(+), 27426 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/a9723491/core/sql/cli/Globals.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/a9723491/core/sql/common/ComRtUtils.cpp ---------------------------------------------------------------------- diff --cc core/sql/common/ComRtUtils.cpp index 15f2e7d,35f9ca7..764b8ee --- a/core/sql/common/ComRtUtils.cpp +++ b/core/sql/common/ComRtUtils.cpp @@@ -1122,26 -1123,3 +1123,26 @@@ const char *ComRtGetUnknownString(Int3 sprintf(ComRtGetUnknownString_Buf, "UNKNOWN (%d)", (int) val); return &(ComRtGetUnknownString_Buf[0]); } + + +pid_t ComRtGetConfiguredPidMax() +{ + FILE *fd_pid_max; + char buffer[100]; + size_t bytesRead = 0; + pid_t pid_max = 0; + + fd_pid_max = fopen("/proc/sys/kernel/pid_max", "r"); + if (fd_pid_max != NULL) { + bytesRead = fread(buffer, 1, sizeof(buffer)-1, fd_pid_max); + if (ferror(fd_pid_max)) + assert(false); + if (feof(fd_pid_max)) + clearerr(fd_pid_max); + buffer[bytesRead] = '\0'; + pid_max = atoi(buffer); + fclose(fd_pid_max); + return pid_max; + } + return 0; - } ++} http://git-wip-us.apache.org/repos/asf/trafodion/blob/a9723491/core/sql/executor/ExExeUtilGetStats.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/a9723491/core/sql/executor/ExStats.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/a9723491/core/sql/runtimestats/SqlStats.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/a9723491/core/sql/runtimestats/SqlStats.h ---------------------------------------------------------------------- diff --cc core/sql/runtimestats/SqlStats.h index eb2cfb4,5e23b0c..8e7dbeb --- a/core/sql/runtimestats/SqlStats.h +++ b/core/sql/runtimestats/SqlStats.h @@@ -532,7 -533,7 +534,8 @@@ private pid_t maxPid_; Int64 ssmpDumpedTimestamp_; MemoryMonitor *memMonitor_; + SyncHashQueue *lobLocks_; + pid_t configuredPidMax_; }; StatsGlobals * shareStatsSegment(Int32 &shmid, NABoolean checkForSSMP = TRUE); short getMasterCpu(char *uniqueStmtId, Lng32 uniqueStmtIdLen, char *nodeName, short maxLen, short &cpu);
