You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2017/05/31 18:47:33 UTC
[32/50] [abbrv] incubator-trafodion git commit: Merge remote branch
'origin/master' into TRAFODION-2001
Merge remote branch 'origin/master' into TRAFODION-2001
Conflicts:
core/sqf/monitor/linux/config.cxx
core/sqf/monitor/linux/pnodeconfig.cxx
core/sqf/monitor/linux/pnodeconfig.h
core/sqf/monitor/linux/reqqueue.cxx
core/sqf/monitor/linux/shell.cxx
core/sqf/sql/scripts/gensq.pl
core/sqf/sql/scripts/sqconfig
core/sqf/sql/scripts/sqconfig.sample
core/sqf/sql/scripts/sqgen
core/sqf/sql/scripts/sqnodestatus
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9523fd2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9523fd2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9523fd2b
Branch: refs/heads/master
Commit: 9523fd2b365885e4e631453d694c75af388fbc01
Parents: cd7862c b5e7300
Author: Zalo Correa <za...@esgyn.com>
Authored: Fri Feb 24 14:27:10 2017 -0800
Committer: Zalo Correa <za...@esgyn.com>
Committed: Fri Feb 24 14:27:10 2017 -0800
----------------------------------------------------------------------
.rat-excludes | 13 +-
RAT_README | 39 +-
core/Makefile | 8 +-
core/bldenvchk.sh | 6 +-
core/conn/Makefile | 4 +-
core/conn/jdbcT4/Makefile | 6 +-
.../trafodion/jdbc/t4/InterfaceUtilities.java | 3 +-
core/conn/jdbc_type2/Makefile | 8 +-
core/conn/jdbc_type2/build.xml | 8 +-
.../native/ResStatisticsStatement.cpp | 123 +-
core/conn/jdbc_type2/samples/README | 4 +-
core/conn/odb/Makefile | 6 +-
core/conn/odbc/src/odbc/Common/QSData.cpp | 24 +
core/conn/odbc/src/odbc/Common/QSData.h | 45 +
core/conn/odbc/src/odbc/Makefile | 12 +-
core/conn/odbc/src/odbc/macros.gmk | 2 +-
core/conn/odbc/src/odbc/nsksrvr/Makefile | 8 +-
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 5 +-
core/conn/odbc/src/odbc/nsksrvrcore/Makefile | 8 +-
.../odbc/nsksrvrcore/ResStatisticsStatement.cpp | 125 +-
core/conn/trafci/.gitignore | 6 +
core/conn/trafci/Makefile | 41 +
core/conn/trafci/build.xml | 10 +-
core/conn/trafci/install/Installer.java | 3389 --------------
core/conn/trafci/install/Installer.java-tmpl | 3368 ++++++++++++++
core/conn/trafci/installer_pom.xml | 119 +
core/conn/trafci/manualtests/README | 2 +-
core/conn/trafci/pom.xml | 140 +
.../org/trafodion/ci/AWTExceptionHandler.java | 36 +
.../main/java/org/trafodion/ci/CSVDisplay.java | 90 +
.../src/main/java/org/trafodion/ci/Column.java | 131 +
.../java/org/trafodion/ci/ConditionalQuery.java | 435 ++
.../trafodion/ci/ConditionalQueryException.java | 43 +
.../trafodion/ci/ConditionalSyntaxError.java | 123 +
.../java/org/trafodion/ci/ConsoleReader.java | 231 +
.../java/org/trafodion/ci/ConsoleWriter.java | 130 +
.../java/org/trafodion/ci/DatabaseQuery.java | 1819 ++++++++
.../src/main/java/org/trafodion/ci/Display.java | 68 +
.../trafodion/ci/DuplicateParamException.java | 40 +
.../main/java/org/trafodion/ci/ErrorObject.java | 103 +
.../src/main/java/org/trafodion/ci/FCQuery.java | 334 ++
.../main/java/org/trafodion/ci/FileReader.java | 176 +
.../main/java/org/trafodion/ci/FileWriter.java | 80 +
.../main/java/org/trafodion/ci/HTMLDisplay.java | 80 +
.../main/java/org/trafodion/ci/HTMLObject.java | 628 +++
.../main/java/org/trafodion/ci/HelpIndexer.java | 134 +
.../src/main/java/org/trafodion/ci/Helper.java | 225 +
.../main/java/org/trafodion/ci/HostQuery.java | 289 ++
.../main/java/org/trafodion/ci/IDisplay.java | 28 +
.../main/java/org/trafodion/ci/IndexStruct.java | 55 +
.../java/org/trafodion/ci/InterfaceQuery.java | 4380 ++++++++++++++++++
.../trafodion/ci/InterfaceQueryException.java | 35 +
.../org/trafodion/ci/InterfaceSyntaxError.java | 83 +
.../trafodion/ci/InvalidNumberOfArguments.java | 35 +
.../main/java/org/trafodion/ci/JDBCVproc.java | 38 +
.../java/org/trafodion/ci/LFProperties.java | 130 +
.../java/org/trafodion/ci/MaskingThread.java | 73 +
.../java/org/trafodion/ci/MultiByteUtils.java | 56 +
.../org/trafodion/ci/NullKeyWordException.java | 35 +
.../org/trafodion/ci/OutputColumnAttribute.java | 47 +
.../java/org/trafodion/ci/OutputContents.java | 144 +
.../main/java/org/trafodion/ci/ParallelRun.java | 1320 ++++++
.../org/trafodion/ci/ParamStringObject.java | 256 +
.../java/org/trafodion/ci/ParseArguments.java | 660 +++
.../src/main/java/org/trafodion/ci/Parser.java | 1195 +++++
.../ci/ParserMissingParamException.java | 42 +
.../trafciDefaultLookAndFeel.properties | 60 +
.../main/java/org/trafodion/ci/PrunSummary.java | 119 +
.../org/trafodion/ci/PrunUserInterruption.java | 34 +
.../java/org/trafodion/ci/PythonInterface.java | 180 +
.../src/main/java/org/trafodion/ci/Query.java | 188 +
.../main/java/org/trafodion/ci/QueryUtils.java | 37 +
.../java/org/trafodion/ci/QueryWrapper.java | 700 +++
.../main/java/org/trafodion/ci/RawDisplay.java | 189 +
.../src/main/java/org/trafodion/ci/Reader.java | 286 ++
.../java/org/trafodion/ci/RepObjInterface.java | 27 +
.../java/org/trafodion/ci/ReplacementObj.java | 39 +
.../org/trafodion/ci/ScriptSectionNotFound.java | 34 +
.../java/org/trafodion/ci/ScriptsInterface.java | 153 +
.../src/main/java/org/trafodion/ci/Session.java | 1919 ++++++++
.../java/org/trafodion/ci/SessionDefaults.java | 342 ++
.../java/org/trafodion/ci/SessionError.java | 181 +
.../java/org/trafodion/ci/SessionInterface.java | 1487 ++++++
.../org/trafodion/ci/SessionTimeoutTask.java | 93 +
.../src/main/java/org/trafodion/ci/SqlEnum.java | 83 +
.../java/org/trafodion/ci/StatusThread.java | 100 +
.../org/trafodion/ci/TerminalProcessBridge.java | 246 +
.../trafodion/ci/UnKnownInterfaceCommand.java | 34 +
.../java/org/trafodion/ci/UserInterface.java | 421 ++
.../java/org/trafodion/ci/UserInterruption.java | 36 +
.../src/main/java/org/trafodion/ci/Utils.java | 381 ++
.../java/org/trafodion/ci/ValidateQuery.java | 412 ++
.../org/trafodion/ci/ValidationException.java | 39 +
.../main/java/org/trafodion/ci/Vproc.java-tmpl | 36 +
.../main/java/org/trafodion/ci/WCIUtils.java | 122 +
.../src/main/java/org/trafodion/ci/Writer.java | 418 ++
.../main/java/org/trafodion/ci/XMLDisplay.java | 75 +
.../main/java/org/trafodion/ci/XMLObject.java | 607 +++
.../org/trafodion/ci/help/common_common.help | 457 ++
.../java/org/trafodion/ci/help/help_file.idx | 30 +
.../java/org/trafodion/ci/help/sql_common.help | 376 ++
.../org/trafodion/ci/pwdencrypt/ArgMap.java | 61 +
.../org/trafodion/ci/pwdencrypt/ArgsDef.java | 74 +
.../trafodion/ci/pwdencrypt/EncryptUtil.java | 249 +
.../java/org/trafodion/ci/pwdencrypt/JCE.java | 414 ++
.../trafodion/ci/pwdencrypt/PasswordOpts.java | 292 ++
.../org/trafodion/ci/pwdencrypt/RefLookup.java | 127 +
.../org/trafodion/ci/pwdencrypt/WorkTypes.java | 55 +
.../trafci/src/main/resources/install_jar.xml | 71 +
.../trafci/src/main/resources/install_tar.xml | 45 +
.../trafci/src/main/resources/trafci.properties | 5 +
.../org/trafodion/ci/AWTExceptionHandler.java | 36 -
.../trafci/src/org/trafodion/ci/CSVDisplay.java | 90 -
.../trafci/src/org/trafodion/ci/Column.java | 131 -
.../src/org/trafodion/ci/ConditionalQuery.java | 435 --
.../trafodion/ci/ConditionalQueryException.java | 43 -
.../trafodion/ci/ConditionalSyntaxError.java | 123 -
.../src/org/trafodion/ci/ConsoleReader.java | 218 -
.../src/org/trafodion/ci/ConsoleWriter.java | 130 -
.../src/org/trafodion/ci/DatabaseQuery.java | 1804 --------
.../trafci/src/org/trafodion/ci/Display.java | 68 -
.../trafodion/ci/DuplicateParamException.java | 40 -
.../src/org/trafodion/ci/ErrorObject.java | 103 -
.../trafci/src/org/trafodion/ci/FCQuery.java | 334 --
.../trafci/src/org/trafodion/ci/FileReader.java | 176 -
.../trafci/src/org/trafodion/ci/FileWriter.java | 80 -
.../src/org/trafodion/ci/HTMLDisplay.java | 80 -
.../trafci/src/org/trafodion/ci/HTMLObject.java | 628 ---
.../src/org/trafodion/ci/HelpIndexer.java | 134 -
.../trafci/src/org/trafodion/ci/Helper.java | 225 -
.../trafci/src/org/trafodion/ci/HostQuery.java | 289 --
.../trafci/src/org/trafodion/ci/IDisplay.java | 28 -
.../src/org/trafodion/ci/IndexStruct.java | 55 -
.../src/org/trafodion/ci/InterfaceQuery.java | 4378 -----------------
.../trafodion/ci/InterfaceQueryException.java | 35 -
.../org/trafodion/ci/InterfaceSyntaxError.java | 83 -
.../trafodion/ci/InvalidNumberOfArguments.java | 35 -
.../trafci/src/org/trafodion/ci/JDBCVproc.java | 38 -
.../src/org/trafodion/ci/LFProperties.java | 130 -
.../src/org/trafodion/ci/MaskingThread.java | 73 -
.../src/org/trafodion/ci/MultiByteUtils.java | 56 -
.../org/trafodion/ci/NullKeyWordException.java | 35 -
.../org/trafodion/ci/OutputColumnAttribute.java | 47 -
.../src/org/trafodion/ci/OutputContents.java | 144 -
.../src/org/trafodion/ci/ParallelRun.java | 1320 ------
.../src/org/trafodion/ci/ParamStringObject.java | 256 -
.../src/org/trafodion/ci/ParseArguments.java | 660 ---
.../trafci/src/org/trafodion/ci/Parser.java | 1195 -----
.../ci/ParserMissingParamException.java | 42 -
.../trafciDefaultLookAndFeel.properties | 60 -
.../src/org/trafodion/ci/PrunSummary.java | 119 -
.../org/trafodion/ci/PrunUserInterruption.java | 34 -
.../src/org/trafodion/ci/PythonInterface.java | 180 -
.../conn/trafci/src/org/trafodion/ci/Query.java | 188 -
.../trafci/src/org/trafodion/ci/QueryUtils.java | 37 -
.../src/org/trafodion/ci/QueryWrapper.java | 700 ---
.../trafci/src/org/trafodion/ci/RawDisplay.java | 189 -
.../trafci/src/org/trafodion/ci/Reader.java | 286 --
.../src/org/trafodion/ci/RepObjInterface.java | 27 -
.../src/org/trafodion/ci/ReplacementObj.java | 39 -
.../org/trafodion/ci/ScriptSectionNotFound.java | 34 -
.../src/org/trafodion/ci/ScriptsInterface.java | 153 -
.../trafci/src/org/trafodion/ci/Session.java | 1908 --------
.../src/org/trafodion/ci/SessionDefaults.java | 342 --
.../src/org/trafodion/ci/SessionError.java | 181 -
.../src/org/trafodion/ci/SessionInterface.java | 1487 ------
.../org/trafodion/ci/SessionTimeoutTask.java | 93 -
.../trafci/src/org/trafodion/ci/SqlEnum.java | 83 -
.../src/org/trafodion/ci/StatusThread.java | 100 -
.../org/trafodion/ci/TerminalProcessBridge.java | 246 -
.../trafodion/ci/UnKnownInterfaceCommand.java | 34 -
.../src/org/trafodion/ci/UserInterface.java | 421 --
.../src/org/trafodion/ci/UserInterruption.java | 36 -
.../conn/trafci/src/org/trafodion/ci/Utils.java | 381 --
.../src/org/trafodion/ci/ValidateQuery.java | 412 --
.../org/trafodion/ci/ValidationException.java | 39 -
.../conn/trafci/src/org/trafodion/ci/Vproc.java | 36 -
.../trafci/src/org/trafodion/ci/WCIUtils.java | 122 -
.../trafci/src/org/trafodion/ci/Writer.java | 418 --
.../trafci/src/org/trafodion/ci/XMLDisplay.java | 75 -
.../trafci/src/org/trafodion/ci/XMLObject.java | 607 ---
.../org/trafodion/ci/help/common_common.help | 457 --
.../src/org/trafodion/ci/help/help_file.idx | 30 -
.../src/org/trafodion/ci/help/sql_common.help | 376 --
.../src/org/trafodion/ci/pwdencrypt/ArgMap.java | 61 -
.../org/trafodion/ci/pwdencrypt/ArgsDef.java | 74 -
.../trafodion/ci/pwdencrypt/EncryptUtil.java | 249 -
.../src/org/trafodion/ci/pwdencrypt/JCE.java | 414 --
.../trafodion/ci/pwdencrypt/PasswordOpts.java | 292 --
.../org/trafodion/ci/pwdencrypt/RefLookup.java | 127 -
.../org/trafodion/ci/pwdencrypt/WorkTypes.java | 55 -
.../org/trafodion/ci/UserInterfaceTest.java | 116 +
core/conn/trafci/utils/ciencr.sh | 8 +-
core/conn/trafci/utils/trafci | 16 +-
core/conn/trafci/utils/trafci.cmd-tmpl | 2 +-
core/conn/trafci/utils/trafci_install.sh | 8 +-
.../odbc/odbcclient/unixcli/cli/cdesc.cpp | 17 +-
.../odbc/odbcclient/unixcli/cli/cdesc.h | 6 +-
.../odbc/odbcclient/unixcli/cli/cdiag.cpp | 10 +-
.../odbc/odbcclient/unixcli/cli/charsetconv.cpp | 4 +-
.../odbc/odbcclient/unixcli/cli/ctosqlconv.cpp | 49 +-
.../odbc/odbcclient/unixcli/cli/ctosqlconv.h | 2 +-
.../odbc/odbcclient/unixcli/cli/sqltocconv.cpp | 403 +-
.../odbc/odbcclient/unixcli/makefile.lnx | 4 +-
.../odbc/odbcclient/unixcli/package/mklnxpkg.sh | 2 +-
.../unixcli/package/runconnect_test.sh | 2 +-
core/dbsecurity/Makefile | 12 +-
core/dbsecurity/auth/Makefile | 16 +-
core/dbsecurity/auth/src/authEvents.cpp | 4 +-
core/dbsecurity/auth/src/ldapconfigfile.cpp | 18 +-
core/dbsecurity/auth/src/sqldapconfigcheck.cpp | 2 +-
core/dbsecurity/cert/Makefile | 10 +-
core/dbsecurity/cert/src/secsrvr.cpp | 2 +-
core/dbsecurity/macros.gmk | 2 +-
core/dbsecurity/scripts/sqcertgen | 2 +-
core/dbsecurity/scripts/update_auth | 16 +-
core/mpi/Makefile | 4 +-
core/rest/Makefile | 2 +-
core/rest/bin/rest | 8 +-
core/rest/conf/rest-env.sh | 4 +-
core/rest/genvers | 2 +-
.../asciidoc/_chapters/getting_started.adoc | 2 +-
core/seamonster/src/Makefile | 4 +-
core/seamonster/src/macros.gmk | 4 +-
core/sqf/LocalSettingsTemplate.sh | 10 +-
core/sqf/Makefile | 13 +-
core/sqf/build-scripts/check_man | 6 +-
core/sqf/build-scripts/genverhdr.ksh | 2 +-
core/sqf/commonLogger/CommonLogger.cpp | 6 +-
core/sqf/commonLogger/CommonLogger.h | 2 +-
core/sqf/conf/install_features | 2 +-
core/sqf/conf/log4cxx.monitor.mon.config | 2 +-
core/sqf/conf/log4cxx.monitor.mon.snmp.config | 2 +-
core/sqf/conf/log4cxx.monitor.psd.config | 2 +-
core/sqf/conf/log4cxx.monitor.wdg.config | 2 +-
core/sqf/conf/log4cxx.monitor.wdg.snmp.config | 2 +-
core/sqf/conf/log4cxx.trafodion.auth.config | 2 +-
core/sqf/conf/log4cxx.trafodion.lob.config | 2 +-
.../sqf/conf/log4cxx.trafodion.masterexe.config | 2 +-
core/sqf/conf/log4cxx.trafodion.sscp.config | 2 +-
core/sqf/conf/log4cxx.trafodion.ssmp.config | 2 +-
core/sqf/conf/log4cxx.trafodion.tm.config | 2 +-
core/sqf/conf/log4cxx.trafodion.udr.config | 2 +-
core/sqf/conf/trafodion.udr.config | 4 +-
.../export/include/common/evl_sqlog_eventnum.h | 2 +
core/sqf/export/include/dtm/tm.h | 10 +-
core/sqf/export/include/dtm/tmtransaction.h | 2 +-
.../sqf/export/limited-support-tools/LSO/README | 56 +-
.../export/limited-support-tools/LSO/offender | 13 +-
.../limited-support-tools/LSO/se_blocked.sql | 35 +
core/sqf/export/share/man/man1/createhooks.1 | 2 +-
core/sqf/export/share/man/man1/sqcore.1 | 4 +-
core/sqf/export/share/man/man1/sqcorefile.1 | 2 +-
core/sqf/export/share/man/man1/sqgen.1 | 38 +-
core/sqf/export/share/man/man1/sqid.1 | 2 +-
core/sqf/export/share/man/man1/sqinfo.1 | 8 +-
core/sqf/export/share/man/man1/sqvers.1 | 8 +-
core/sqf/export/share/man/man1/update_sql.1 | 2 +-
core/sqf/gdb/create-host-tar-lib | 14 +-
core/sqf/hbase_utilities/Makefile | 6 +-
.../backup_restore_functions.sh | 16 +-
core/sqf/inc/cextdecs/cextdecs.h | 14 +
core/sqf/macros.gmk | 8 +-
core/sqf/monitor/linux/clusterconf.cxx | 2 +-
core/sqf/monitor/linux/macros.gmk | 2 +-
core/sqf/monitor/linux/makefile | 5 +-
core/sqf/monitor/linux/monitor.cxx | 8 +-
core/sqf/monitor/linux/monlogging.cxx | 4 +-
core/sqf/monitor/linux/montest_run.virtual | 6 +-
core/sqf/monitor/linux/pnode.cxx | 2 +-
core/sqf/monitor/linux/pnodeconfig.cxx | 57 +-
core/sqf/monitor/linux/pnodeconfig.h | 1 +
core/sqf/monitor/linux/process.cxx | 43 +-
core/sqf/monitor/linux/process.h | 2 +-
core/sqf/monitor/linux/pstartd.cxx | 2 +-
core/sqf/monitor/linux/reqqueue.cxx | 14 +
core/sqf/monitor/linux/shell.cxx | 58 +-
core/sqf/monitor/linux/zclient.cxx | 110 +-
core/sqf/monitor/linux/zclient.h | 83 +-
core/sqf/monitor/linux/zootest.cxx | 5 +-
core/sqf/monitor/test/notes.txt | 2 +-
core/sqf/monitor/test/runtest | 46 +-
core/sqf/monitor/test/sqconfig.monitor.cluster | 2 +-
core/sqf/sqenvcom.sh | 67 +-
core/sqf/sqevlog/sq_evl_libs/macros.gmk | 2 +-
core/sqf/sqid | 10 +-
core/sqf/sqinfo | 18 +-
core/sqf/sql/macros.gmk | 2 +-
core/sqf/sql/scripts/UsasRepos | 2 +-
core/sqf/sql/scripts/analyzeMessageGuide.py | 656 +++
.../sqf/sql/scripts/bats/runmonitorbats.virtual | 6 +-
core/sqf/sql/scripts/bats/runseabedbats.virtual | 8 +-
core/sqf/sql/scripts/bats/runsqlreg.virtual | 8 +-
core/sqf/sql/scripts/bats/runtmbats.virtual | 14 +-
core/sqf/sql/scripts/bats/sqconfig.tm | 4 +-
core/sqf/sql/scripts/build_apidocs.sh | 4 +-
core/sqf/sql/scripts/ckill | 4 +-
core/sqf/sql/scripts/ckillall | 4 +-
core/sqf/sql/scripts/cleanZKNodes | 2 +-
core/sqf/sql/scripts/cleanat | 2 +-
core/sqf/sql/scripts/cleanlogs | 16 +-
core/sqf/sql/scripts/cresumeall | 4 +-
core/sqf/sql/scripts/cstat | 2 +-
core/sqf/sql/scripts/csuspendall | 6 +-
core/sqf/sql/scripts/dbcheck | 12 +-
core/sqf/sql/scripts/genmon | 2 +-
core/sqf/sql/scripts/genms | 10 +-
core/sqf/sql/scripts/gensq.pl | 4 +-
core/sqf/sql/scripts/genstats.sh | 2 +-
core/sqf/sql/scripts/get_libhdfs_files | 6 +-
core/sqf/sql/scripts/ilh_cleanhb | 12 +-
core/sqf/sql/scripts/ilh_hbase_repair | 8 +-
core/sqf/sql/scripts/ilh_hbcheck | 4 +-
core/sqf/sql/scripts/ilh_traf_restart | 16 +-
core/sqf/sql/scripts/ilh_trafinit | 16 +-
core/sqf/sql/scripts/install_apache_hadoop | 52 +-
core/sqf/sql/scripts/install_local_drill | 16 +-
core/sqf/sql/scripts/install_local_hadoop | 26 +-
core/sqf/sql/scripts/install_traf_components | 81 +-
core/sqf/sql/scripts/krb5check | 4 +-
core/sqf/sql/scripts/krb5functions | 4 +-
core/sqf/sql/scripts/krb5service | 8 +-
core/sqf/sql/scripts/makemsg.ksh | 8 +-
core/sqf/sql/scripts/qmmstart | 2 +-
core/sqf/sql/scripts/rmscheck | 2 +-
core/sqf/sql/scripts/runbats | 24 +-
core/sqf/sql/scripts/sqcheck | 2 +-
core/sqf/sql/scripts/sqcheckmon | 2 +-
core/sqf/sql/scripts/sqcore | 14 +-
core/sqf/sql/scripts/sqcorefile | 6 +-
core/sqf/sql/scripts/sqgen | 62 +-
core/sqf/sql/scripts/sqnodeipcrm | 4 +-
core/sqf/sql/scripts/sqnodestatus | 4 +-
core/sqf/sql/scripts/sqsmdstats | 10 +-
core/sqf/sql/scripts/sqstart | 32 +-
core/sqf/sql/scripts/sqstop | 22 +-
core/sqf/sql/scripts/sqsystem.pm | 4 +-
core/sqf/sql/scripts/traf_authentication_config | 4 +-
core/sqf/sql/scripts/traf_authentication_setup | 36 +-
core/sqf/sql/scripts/trafnodestatus | 10 +-
core/sqf/sql/scripts/uninstall_traf_components | 22 +-
core/sqf/sql/scripts/update_hbase | 11 +-
core/sqf/sql/scripts/update_sql | 10 +-
core/sqf/sqvers | 20 +-
core/sqf/src/seabed/macros.gmk | 2 +-
core/sqf/src/seabed/src/env.cpp | 2 +-
core/sqf/src/seabed/src/util.cpp | 2 +-
core/sqf/src/seabed/test/go284j | 2 +-
core/sqf/src/seabed/test/go9 | 4 +-
core/sqf/src/seabed/test/goshell205 | 2 +-
core/sqf/src/seabed/test/gostart | 4 +-
core/sqf/src/seabed/test/t9thread.rh6.supp | 56 +-
core/sqf/src/seabed/test/tcheck.cpp | 2 +-
core/sqf/src/seabed/tools/sqmanvers | 2 +-
core/sqf/src/seabed/tools/sqmanvers.java | 2 +-
core/sqf/src/seatrans/hbase-trx/Makefile | 64 +-
core/sqf/src/seatrans/hbase-trx/genvers | 2 +-
core/sqf/src/seatrans/hbase-trx/pp.awk | 152 +-
.../transactional/TransactionManager.java | 14 +-
.../client/transactional/TransactionState.java | 24 +
.../transactional/CommitConflictException.java | 61 +
.../transactional/TrxRegionEndpoint.java.tmpl | 90 +-
.../transactional/TrxTransactionState.java.tmpl | 73 +-
core/sqf/src/seatrans/tm/hbasetmlib2/Makefile | 6 +-
.../seatrans/tm/hbasetmlib2/TMInterface.java | 2 +-
.../sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp | 234 +-
core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h | 2 +-
.../tm/hbasetmlib2/javaobjectinterfacetm.cpp | 156 +-
.../tm/hbasetmlib2/javaobjectinterfacetm.h | 16 +-
.../src/seatrans/tm/hbasetmlib2/pom.xml.apache | 4 +-
.../sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp | 2 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 65 +-
.../dtm/TransactionManagerException.java | 70 +
.../sqf/src/seatrans/tm/hbasetmlib2/testrun.cpp | 6 +-
core/sqf/src/seatrans/tm/macros.gmk | 6 +-
core/sqf/src/tm/Makefile | 6 +-
core/sqf/src/tm/macros.gmk | 6 +-
core/sqf/src/tm/tmlib.cpp | 56 +-
core/sqf/src/tm/tmlib.h | 1 +
core/sqf/src/tm/tmlibmsg.h | 2 +
core/sqf/src/tm/tmrm.h | 2 +-
core/sqf/src/tm/tmrmhbase.cpp | 9 +-
core/sqf/src/tm/tmrmhbase.h | 2 +-
core/sqf/src/tm/tmrmtse.cpp | 2 +-
core/sqf/src/tm/tmrmtse.h | 2 +-
core/sqf/src/tm/tmtransaction.cpp | 9 +-
core/sqf/src/tm/tmtx.cpp | 2 +-
core/sqf/src/tm/tmtxbranches.cpp | 7 +-
core/sqf/src/tm/tmtxbranches.h | 2 +-
core/sqf/src/tm/tmxatxn.cpp | 2 +-
core/sqf/src/tm/tools/dtmci.cpp | 1 +
core/sqf/src/tm/tools/run_dtmci | 4 +-
core/sqf/sysinstall/etc/init.d/trafodion | 131 +
.../etc/security/limits.d/trafodion.conf | 25 +
core/sqf/sysinstall/etc/sudoers.d/trafodion | 35 +
core/sqf/sysinstall/home/trafodion/.bashrc | 69 +
core/sqf/tools/sqdiag_core_compare | 2 +-
core/sqf/tools/sqdiag_core_mask | 2 +-
core/sqf/tools/sqtools.sh | 116 +-
core/sql/SqlCompilerDebugger/cln.sh | 6 +-
core/sql/arkcmp/CmpErrLog.cpp | 6 +-
core/sql/arkcmp/CmpStatement.cpp | 46 +-
core/sql/arkcmp/CmpStatement.h | 7 +-
core/sql/arkcmp/CompException.cpp | 82 +-
core/sql/arkcmp/CompException.h | 25 +-
core/sql/bin/SqlciErrors.txt | 131 +-
core/sql/bin/clitest.cpp | 97 +-
core/sql/bin/ex_esp_main.cpp | 20 +-
core/sql/cli/Cli.cpp | 174 +-
core/sql/cli/Cli.h | 1 +
core/sql/cli/CliExtern.cpp | 2 +
core/sql/cli/Context.cpp | 9 -
core/sql/cli/Globals.cpp | 97 +-
core/sql/cli/Globals.h | 4 -
core/sql/cli/SessionDefaults.cpp | 2 +-
core/sql/cli/Statement.cpp | 123 -
core/sql/cli/Statement.h | 5 -
core/sql/cli/memorymonitor.cpp | 76 +-
core/sql/cli/memorymonitor.h | 18 +-
core/sql/cli/sqlcli.h | 23 +-
core/sql/clitest/blobtest.cpp | 108 +-
core/sql/clitest/blobtest.h | 3 +
core/sql/comexe/ComTdb.h | 3 +
core/sql/comexe/ComTdbExeUtil.cpp | 82 +-
core/sql/comexe/ComTdbExeUtil.h | 116 +-
core/sql/comexe/ComTdbHbaseAccess.cpp | 22 +-
core/sql/comexe/ComTdbHbaseAccess.h | 27 +-
core/sql/comexe/ComTdbHdfsScan.h | 2 +-
core/sql/comexe/ComTdbRoot.h | 3 +-
core/sql/comexe/ComTdbSort.h | 2 +-
core/sql/common/CharType.cpp | 2 +-
core/sql/common/ComJSON.cpp | 1175 +++++
core/sql/common/ComJSON.h | 159 +
core/sql/common/ComJSONFuncs.cpp | 793 ++++
core/sql/common/ComJSONStringInfo.cpp | 297 ++
core/sql/common/ComJSONStringInfo.h | 176 +
core/sql/common/ComMisc.cpp | 28 +-
core/sql/common/ComMisc.h | 2 +
core/sql/common/ComResWords.cpp | 1 -
core/sql/common/ComRtUtils.cpp | 2 +-
core/sql/common/ComSSL.cpp | 49 +
core/sql/common/ComSSL.h | 60 +
core/sql/common/ComSmallDefs.h | 29 +-
core/sql/common/ComUser.cpp | 27 +
core/sql/common/ComUser.h | 2 +
core/sql/common/ExprNode.cpp | 19 +-
core/sql/common/Ipc.cpp | 4 +-
core/sql/common/NAMemory.cpp | 2 +-
core/sql/common/NAString.cpp | 1 +
core/sql/common/OperTypeEnum.h | 10 +-
core/sql/common/sql_charset_strings.h | 2 +
core/sql/executor/ExComTdb.cpp | 7 +
core/sql/executor/ExExeUtil.h | 119 +-
core/sql/executor/ExExeUtilCli.cpp | 10 +-
core/sql/executor/ExExeUtilCli.h | 3 +-
core/sql/executor/ExExeUtilCommon.cpp | 28 +-
core/sql/executor/ExExeUtilGet.cpp | 964 ++--
core/sql/executor/ExExeUtilGetStats.cpp | 306 +-
core/sql/executor/ExExeUtilLoad.cpp | 784 +++-
core/sql/executor/ExHbaseAccess.cpp | 353 +-
core/sql/executor/ExHbaseAccess.h | 18 +-
core/sql/executor/ExHbaseIUD.cpp | 308 +-
core/sql/executor/ExHbaseSelect.cpp | 4 +-
core/sql/executor/ExHdfsScan.cpp | 171 +-
core/sql/executor/ExHdfsScan.h | 13 +-
core/sql/executor/ExSMTrace.cpp | 6 +-
core/sql/executor/ExStats.cpp | 3097 +++++--------
core/sql/executor/ExStats.h | 623 +--
core/sql/executor/HBaseClient_JNI.cpp | 50 +-
core/sql/executor/HBaseClient_JNI.h | 3 +-
core/sql/executor/HdfsLogger.h | 2 +-
core/sql/executor/JavaObjectInterface.cpp | 2 +-
core/sql/executor/ex_control.cpp | 8 +-
core/sql/executor/ex_exe_stmt_globals.h | 3 -
core/sql/executor/ex_frag_rt.cpp | 16 +-
core/sql/executor/ex_hash_grby.h | 3 -
core/sql/executor/ex_root.cpp | 38 -
core/sql/executor/ex_sort.cpp | 6 +
core/sql/executor/ex_transaction.cpp | 15 +-
core/sql/executor/hiveHook.cpp | 3 +-
core/sql/exp/ExpError.h | 4 +-
core/sql/exp/ExpErrorEnums.h | 25 +
core/sql/exp/ExpHbaseDefs.h | 2 +
core/sql/exp/ExpHbaseInterface.cpp | 16 +-
core/sql/exp/ExpHbaseInterface.h | 8 +-
core/sql/exp/ExpLOB.cpp | 94 +-
core/sql/exp/ExpLOB.h | 14 +-
core/sql/exp/ExpLOBaccess.cpp | 359 +-
core/sql/exp/ExpLOBaccess.h | 42 +-
core/sql/exp/ExpLOBenums.h | 2 +
core/sql/exp/ExpLOBexternal.h | 1 +
core/sql/exp/ExpLOBinterface.cpp | 6 +-
core/sql/exp/ExpLOBinterface.h | 3 +
core/sql/exp/ExpLOBprocess.cpp | 2 +-
core/sql/exp/ExpPackDefs.cpp | 15 +
core/sql/exp/exp_clause.cpp | 21 +
core/sql/exp/exp_clause.h | 5 +-
core/sql/exp/exp_datetime.cpp | 72 +-
core/sql/exp/exp_datetime.h | 21 +
core/sql/exp/exp_function.cpp | 297 +-
core/sql/exp/exp_function.h | 94 +
core/sql/exp/exp_math_func.cpp | 19 +-
core/sql/export/ComDiags.cpp | 6 +-
core/sql/export/ComDiags.h | 2 +-
core/sql/export/ExceptionCallBack.h | 6 +-
core/sql/export/NAAbort.cpp | 16 +-
core/sql/generator/GenExpGenerator.cpp | 161 +-
core/sql/generator/GenExpGenerator.h | 57 +-
core/sql/generator/GenItemFunc.cpp | 36 +-
core/sql/generator/GenKey.cpp | 140 +-
core/sql/generator/GenPreCode.cpp | 113 +-
core/sql/generator/GenRelExeUtil.cpp | 206 +-
core/sql/generator/GenRelMisc.cpp | 19 +-
core/sql/generator/GenRelScan.cpp | 273 +-
core/sql/generator/GenRelUpdate.cpp | 140 +-
core/sql/generator/GenShape.cpp | 4 +-
core/sql/generator/Generator.cpp | 1 +
core/sql/generator/LmExpr.cpp | 6 +-
core/sql/langman/LmLangManagerJava.cpp | 2 +-
core/sql/lib_mgmt/Makefile | 4 +-
core/sql/lib_mgmt/README.rst | 2 +-
core/sql/lib_mgmt/pom.xml | 2 +-
.../java/org/trafodion/libmgmt/FileMgmt.java | 2 +-
.../lib_mgmt/src/main/resources/init_libmgmt.sh | 2 +-
core/sql/nskgmake/Makerules.linux | 30 +-
core/sql/nskgmake/Makerules.mk | 10 +-
core/sql/nskgmake/cli/Makefile | 2 +-
core/sql/nskgmake/clitest/Makefile | 2 +-
core/sql/nskgmake/common/Makefile | 4 +
core/sql/nskgmake/tdm_sqlexp/Makefile | 14 +-
core/sql/optimizer/BindItemExpr.cpp | 195 +-
core/sql/optimizer/BindRelExpr.cpp | 395 +-
core/sql/optimizer/BindWA.h | 13 +-
core/sql/optimizer/ColStatDesc.cpp | 96 +
core/sql/optimizer/ColStatDesc.h | 25 +-
core/sql/optimizer/ImplRule.cpp | 30 +-
core/sql/optimizer/Inlining.cpp | 88 +-
core/sql/optimizer/ItemExpr.cpp | 45 +-
core/sql/optimizer/ItemFunc.h | 13 +-
core/sql/optimizer/NAColumn.h | 9 +-
core/sql/optimizer/NAFileSet.cpp | 7 +
core/sql/optimizer/NAFileSet.h | 2 +-
core/sql/optimizer/NATable.cpp | 154 +-
core/sql/optimizer/NATable.h | 22 +-
core/sql/optimizer/NormRelExpr.cpp | 529 ++-
core/sql/optimizer/ObjectNames.cpp | 10 +
core/sql/optimizer/ObjectNames.h | 3 +
core/sql/optimizer/OptLogRelExpr.cpp | 77 +-
core/sql/optimizer/OptPhysRelExpr.cpp | 13 +-
core/sql/optimizer/RETDesc.cpp | 44 +-
core/sql/optimizer/RelExeUtil.cpp | 174 +-
core/sql/optimizer/RelExeUtil.h | 84 +-
core/sql/optimizer/RelExpr.cpp | 430 +-
core/sql/optimizer/RelExpr.h | 16 +-
core/sql/optimizer/RelGrby.h | 5 +-
core/sql/optimizer/RelJoin.h | 7 +-
core/sql/optimizer/RelMisc.h | 188 +-
core/sql/optimizer/RelRoutine.cpp | 150 +-
core/sql/optimizer/RelRoutine.h | 77 +-
core/sql/optimizer/RelScan.h | 14 +-
core/sql/optimizer/RelSequence.cpp | 9 +-
core/sql/optimizer/RelSet.h | 5 +-
core/sql/optimizer/RelUpdate.h | 86 +-
core/sql/optimizer/SynthType.cpp | 140 +-
core/sql/optimizer/TransRule.cpp | 5 +-
core/sql/optimizer/UdfDllInteraction.cpp | 44 +-
core/sql/optimizer/VEGTable.cpp | 29 +-
core/sql/optimizer/ValueDesc.cpp | 8 +-
core/sql/optimizer/ValueDesc.h | 2 +-
core/sql/optimizer/costmethod.cpp | 4 +
core/sql/parser/BindStmtDDL.cpp | 4 +
core/sql/parser/ElemDDLConstraintPK.h | 37 +-
core/sql/parser/ElemDDLLikeOptions.cpp | 23 +
core/sql/parser/ElemDDLLikeOptions.h | 28 +
core/sql/parser/ElemDDLNode.cpp | 5 +
core/sql/parser/ElemDDLNode.h | 2 +
core/sql/parser/ElemDDLStoreOptions.cpp | 3 +-
core/sql/parser/ElemDDLStoreOptions.h | 14 +
core/sql/parser/ParDDLLikeOpts.cpp | 16 +
core/sql/parser/ParDDLLikeOptsCreateTable.h | 14 +-
core/sql/parser/ParKeyWords.cpp | 14 +-
core/sql/parser/SqlParserAux.cpp | 7 +-
core/sql/parser/SqlParserAux.h | 2 +
core/sql/parser/StmtDDLAlterTable.h | 18 +
core/sql/parser/StmtDDLCleanupObjects.h | 18 +
core/sql/parser/StmtDDLCreate.cpp | 7 +-
core/sql/parser/StmtDDLCreateTable.h | 42 +-
core/sql/parser/StmtDDLMisc.cpp | 4 +
core/sql/parser/sqlparser.y | 286 +-
core/sql/parser/ulexer.cpp | 7 +
core/sql/pom.xml | 7 +
core/sql/pom.xml.apache | 2 +-
core/sql/pom.xml.hdp | 2 +-
core/sql/qms/QmmQmm.cpp | 2 +-
core/sql/qmscommon/QRLogger.cpp | 6 +-
core/sql/qmscommon/QRLogger.h | 2 +-
core/sql/regress/compGeneral/DIFF042.KNOWN | 106 +-
core/sql/regress/compGeneral/EXPECTED005 | 54 +-
core/sql/regress/compGeneral/EXPECTED006.SB | 682 ++-
core/sql/regress/compGeneral/EXPECTED013.SB | 21 +-
core/sql/regress/compGeneral/EXPECTED042 | 785 ++--
core/sql/regress/compGeneral/EXPECTED045 | 91 +-
core/sql/regress/compGeneral/EXPECTED071 | 4 +-
core/sql/regress/compGeneral/FILTER042 | 6 +-
core/sql/regress/compGeneral/TEST006 | 115 +
core/sql/regress/compGeneral/TEST042 | 92 +-
core/sql/regress/compGeneral/TEST045 | 11 +
core/sql/regress/compGeneral/TEST071 | 4 +-
core/sql/regress/core/EXPECTED005.SB | 2 +-
core/sql/regress/core/EXPECTED061.SB | 10 +-
core/sql/regress/core/EXPECTED116 | 47 +-
core/sql/regress/core/EXPECTEDRTS | 2189 +++++----
core/sql/regress/core/FILTERRTS | 15 +-
core/sql/regress/core/TESTRTS | 11 +
core/sql/regress/executor/DIFF015.KNOWN | 24 +
core/sql/regress/executor/EXPECTED013.SB | 2 +-
core/sql/regress/executor/EXPECTED015.SB | 211 +-
core/sql/regress/executor/EXPECTED107 | 52 +
core/sql/regress/executor/EXPECTED130 | 316 +-
core/sql/regress/executor/EXPECTED140 | 75 +-
core/sql/regress/executor/FILTER140 | 1 +
core/sql/regress/executor/TEST015 | 77 +-
core/sql/regress/executor/TEST107 | 27 +
core/sql/regress/executor/TEST130 | 63 +-
core/sql/regress/executor/TEST130_argfile3 | 3 +
core/sql/regress/hive/EXPECTED005 | 149 +-
core/sql/regress/hive/EXPECTED007 | 373 ++
core/sql/regress/hive/EXPECTED009 | 62 +-
core/sql/regress/hive/EXPECTED015 | 254 +-
core/sql/regress/hive/EXPECTED018 | 522 ++-
core/sql/regress/hive/FILTER005 | 34 +
core/sql/regress/hive/FILTER015 | 3 +-
core/sql/regress/hive/FILTER018 | 3 +-
core/sql/regress/hive/TEST005 | 13 +
core/sql/regress/hive/TEST007 | 160 +
core/sql/regress/hive/TEST009 | 10 +-
core/sql/regress/newregr/mvqr/installMvqrSQ | 6 +-
core/sql/regress/newregr/mvqr/uninstallMvqrSQ | 2 +-
core/sql/regress/privs1/EXPECTED123 | 1187 +++++
core/sql/regress/privs1/EXPECTED141 | Bin 100853 -> 102260 bytes
core/sql/regress/privs1/TEST123 | 178 +
core/sql/regress/privs1/TEST141 | 10 +-
core/sql/regress/privs2/EXPECTED129 | 52 +-
core/sql/regress/privs2/EXPECTED138 | 6 +-
core/sql/regress/privs2/EXPECTED140 | 4 +-
core/sql/regress/privs2/EXPECTED144 | Bin 59408 -> 59453 bytes
core/sql/regress/privs2/FILTER144 | 31 +
core/sql/regress/qat/eqatdml12 | 36 +-
core/sql/regress/qat/eqatdml13 | 36 +-
core/sql/regress/seabase/DIFF025.KNOWN | 2 +-
core/sql/regress/seabase/EXPECTED012 | 22 +-
core/sql/regress/seabase/EXPECTED020 | 24 +-
core/sql/regress/seabase/EXPECTED022 | 872 +++-
core/sql/regress/seabase/EXPECTED027 | 2 +-
core/sql/regress/seabase/EXPECTED030 | 141 +-
core/sql/regress/seabase/EXPECTED032 | 17 +-
core/sql/regress/seabase/TEST022 | 284 +-
core/sql/regress/seabase/TEST030 | 28 +-
core/sql/regress/seabase/TEST032 | 4 +-
core/sql/regress/tools/dll-compile.ksh | 6 +-
core/sql/regress/tools/java-compile.ksh | 2 +-
core/sql/regress/tools/regress-filter-linux | 8 +-
core/sql/regress/tools/regrhadoop.ksh | 2 +-
core/sql/regress/tools/regrhbase.ksh | 2 +-
core/sql/regress/tools/regrhive.ksh | 2 +-
core/sql/regress/tools/runallsb | 8 +-
core/sql/regress/tools/runregr_compGeneral.ksh | 39 +-
core/sql/regress/tools/runregr_executor.ksh | 2 +-
core/sql/regress/tools/runregr_hive.ksh | 2 +-
core/sql/regress/tools/runregr_seabase.ksh | 2 +-
core/sql/regress/tools/runregr_udr.ksh | 4 +-
core/sql/regress/tools/setupenv | 4 +-
core/sql/regress/tools/setuplnxenv | 24 +-
core/sql/regress/udr/EXPECTED001 | 98 +-
core/sql/regress/udr/EXPECTED002 | 10 +-
core/sql/regress/udr/EXPECTED100.SB | 2 +-
core/sql/regress/udr/TEST001 | 31 +-
core/sql/regress/udr/TEST002 | 10 +-
core/sql/regress/udr/TEST107 | 4 +-
core/sql/regress/udr/TEST163 | 4 +-
core/sql/regress/udr/Utils.java | 4 +-
core/sql/regress/udr/tvudf.c | 2 +-
core/sql/runtimestats/SqlStats.cpp | 12 +
core/sql/runtimestats/SqlStats.h | 7 +-
core/sql/runtimestats/sscpipc.cpp | 12 +
core/sql/runtimestats/ssmpipc.cpp | 1 -
core/sql/smdio/CmUtil.cpp | 1 -
core/sql/sort/CommonStructs.h | 1 -
core/sql/sqlcat/TrafDDLdesc.h | 7 +-
core/sql/sqlcat/desc.h | 29 -
core/sql/sqlci/SqlCmd.cpp | 4 +
core/sql/sqlci/SqlciStats.cpp | 44 +-
core/sql/sqlci/sqlci_yacc.y | 57 +-
core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 89 +-
core/sql/sqlcomp/CmpDescribe.cpp | 162 +-
core/sql/sqlcomp/CmpMain.cpp | 15 +
core/sql/sqlcomp/CmpSeabaseDDL.h | 40 +-
core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 103 +-
core/sql/sqlcomp/CmpSeabaseDDLauth.h | 1 +
core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 4 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 115 +-
core/sql/sqlcomp/CmpSeabaseDDLindex.cpp | 38 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 24 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 57 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 1911 ++++----
core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp | 7 +
core/sql/sqlcomp/CmpSeabaseDDLutil.cpp | 6 +-
core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 273 +-
core/sql/sqlcomp/DefaultConstants.h | 24 +-
core/sql/sqlcomp/PrivMgr.cpp | 10 +-
core/sql/sqlcomp/PrivMgr.h | 5 +-
core/sql/sqlcomp/PrivMgrCommands.cpp | 65 +-
core/sql/sqlcomp/PrivMgrCommands.h | 6 +
core/sql/sqlcomp/PrivMgrPrivileges.cpp | 26 +-
core/sql/sqlcomp/PrivMgrPrivileges.h | 4 +-
core/sql/sqlcomp/PrivMgrRoles.cpp | 106 +-
core/sql/sqlcomp/nadefaults.cpp | 26 +-
core/sql/sqlmsg/GetErrorMessage.cpp | 2 +-
core/sql/sqlmxevents/logmxevent_traf.cpp | 150 +-
core/sql/sqlmxevents/logmxevent_traf.h | 7 +-
core/sql/sqludr/SqlUdrPredefLogReader.cpp | 4 +-
core/sql/sqludr/doxygen_tmudr.1.6.config | 2 +-
core/sql/sqludr/sqludr.cpp | 370 +-
core/sql/sqludr/sqludr.h | 20 +-
.../java/org/trafodion/sql/HBaseClient.java | 97 +-
.../main/java/org/trafodion/sql/HiveClient.java | 5 +-
.../org/trafodion/sql/TrafConfiguration.java | 2 +-
.../java/org/trafodion/sql/udr/ColumnInfo.java | 22 +-
.../sql/udr/ComparisonPredicateInfo.java | 15 +-
.../org/trafodion/sql/udr/ConstraintInfo.java | 13 +-
.../java/org/trafodion/sql/udr/OrderInfo.java | 4 +
.../trafodion/sql/udr/ParameterListInfo.java | 14 +-
.../org/trafodion/sql/udr/PartitionInfo.java | 6 +-
.../org/trafodion/sql/udr/PredicateInfo.java | 17 +-
.../sql/udr/TMUDRSerializableObject.java | 72 +-
.../java/org/trafodion/sql/udr/TableInfo.java | 14 +-
.../java/org/trafodion/sql/udr/TupleInfo.java | 256 +-
.../java/org/trafodion/sql/udr/TypeInfo.java | 117 +-
.../main/java/org/trafodion/sql/udr/UDR.java | 103 +-
.../trafodion/sql/udr/UDRInvocationInfo.java | 39 +-
.../java/org/trafodion/sql/udr/UDRPlanInfo.java | 38 +-
.../org/trafodion/sql/udr/predef/JDBCUDR.java | 6 +-
.../org/trafodion/sql/ustat/ChgAutoList.java | 2 +-
.../java/org/trafodion/sql/ustat/UstatUtil.java | 4 +-
core/sql/udrserv/UdrCfgParser.cpp | 2 +-
core/sql/udrserv/spinfoCallback.cpp | 2 +-
core/sql/udrserv/udrload.cpp | 2 +-
core/sql/udrserv/udrserv.cpp | 2 +-
core/sql/ustat/FillAutoTbl.sh | 4 +-
core/sql/ustat/RunLogUstats.sh | 2 +-
core/sql/ustat/StopAutoStats.sh | 2 +-
core/sql/ustat/USAS.sh | 16 +-
core/sql/ustat/hs_cli.cpp | 27 +-
core/sql/ustat/hs_cli.h | 3 +
core/sql/ustat/hs_const.h | 1 +
core/sql/ustat/hs_globals.cpp | 50 +-
core/sql/ustat/hs_la.cpp | 31 +-
core/sql/ustat/hs_la.h | 27 +-
core/sql/ustat/hs_log.cpp | 7 +-
core/sql/ustat/hs_parser.cpp | 13 +
core/sql/ustat/hs_util.cpp | 4 +-
core/sql/ustat/stats_profile | 8 +-
core/trafodion.spec | 29 +-
dcs/Makefile | 2 +-
dcs/bin/dcs | 12 +-
dcs/bin/dcs-config.sh | 6 +-
dcs/conf/dcs-env.sh | 14 +-
dcs/genvers | 2 +-
.../main/asciidoc/_chapters/configuration.adoc | 2 +-
.../asciidoc/_chapters/getting_started.adoc | 2 +-
.../org/trafodion/dcs/server/ServerManager.java | 2 +-
.../trafodion/dcs/servermt/ServerManager.java | 14 +-
.../org/trafodion/dcs/util/RetryCounter.java | 2 +-
.../org/trafodion/jdbc_test/TestNumeric.java | 114 +
dcs/src/test/odbc/README.txt | 47 +
dcs/src/test/odbc/build/Makefile | 43 +
dcs/src/test/odbc/build/odbc.vcxproj | 157 +
dcs/src/test/odbc/build/odbc.vcxproj.filters | 40 +
dcs/src/test/odbc/src/Main.cpp | 57 +
dcs/src/test/odbc/src/common/Global.cpp | 116 +
dcs/src/test/odbc/src/common/Global.h | 60 +
dcs/src/test/odbc/src/common/TestBase.cpp | 263 ++
dcs/src/test/odbc/src/common/TestBase.h | 55 +
.../src/test/varchar32k/LargeVarcharCol.cpp | 2639 +++++++++++
.../odbc/src/test/varchar32k/LargeVarcharCol.h | 52 +
.../src/asciidoc/_chapters/ddl_msgs.adoc | 628 +--
.../src/asciidoc/_chapters/executor_msgs.adoc | 15 +
.../src/asciidoc/_chapters/about.adoc | 2 +-
.../src/asciidoc/_chapters/activate.adoc | 4 +-
.../src/asciidoc/_chapters/ambari_install.adoc | 92 +
.../src/asciidoc/_chapters/enable_security.adoc | 20 +-
.../src/asciidoc/_chapters/introduction.adoc | 28 +-
.../src/asciidoc/_chapters/prepare.adoc | 136 +-
.../src/asciidoc/_chapters/quickstart.adoc | 8 +-
.../src/asciidoc/_chapters/recipe_install.adoc | 29 -
.../src/asciidoc/_chapters/recipe_upgrade.adoc | 30 -
.../src/asciidoc/_chapters/requirements.adoc | 159 +-
.../src/asciidoc/_chapters/script_install.adoc | 2 -
.../src/asciidoc/_chapters/script_remove.adoc | 2 +-
.../src/asciidoc/_chapters/script_upgrade.adoc | 6 +-
docs/provisioning_guide/src/asciidoc/index.adoc | 4 +-
.../sql_functions_and_expressions.adoc | 286 +-
.../_chapters/sql_language_elements.adoc | 134 +-
.../src/asciidoc/_chapters/sql_statements.adoc | 437 +-
docs/src/site/markdown/architecture-overview.md | 2 +-
docs/src/site/markdown/management.md | 6 +-
.../site/markdown/traf_authentication_config.md | 8 +-
install/.gitignore | 5 +
install/Makefile | 39 +-
install/README.md | 81 +
install/ambari-installer/Makefile | 87 +
install/ambari-installer/meta.template | 34 +
.../mpack-install/am_install.sh | 56 +
install/ambari-installer/mpack.json | 46 +
install/ambari-installer/repo.template | 24 +
.../TRAFODION/2.1/configuration/dcs-env.xml | 150 +
.../TRAFODION/2.1/configuration/dcs-log4j.xml | 107 +
.../TRAFODION/2.1/configuration/dcs-site.xml | 271 ++
.../TRAFODION/2.1/configuration/rest-site.xml | 157 +
.../2.1/configuration/traf-cluster-env.xml | 41 +
.../2.1/configuration/trafodion-env.xml | 252 +
.../common-services/TRAFODION/2.1/metainfo.xml | 165 +
.../TRAFODION/2.1/package/scripts/params.py | 95 +
.../2.1/package/scripts/status_params.py | 23 +
.../2.1/package/scripts/trafodiondcs.py | 60 +
.../2.1/package/scripts/trafodionmaster.py | 186 +
.../2.1/package/scripts/trafodionnode.py | 217 +
.../TRAFODION/2.1/role_command_order.json | 21 +
.../TRAFODION/2.1/service_advisor.py | 255 +
.../TRAFODION/2.1/themes/theme.json | 192 +
install/ambari-installer/traf_ambari.spec | 76 +
install/installer/addNode_step1 | 8 +-
install/installer/addNode_step2 | 28 +-
install/installer/bashrc_default | 7 +-
install/installer/dcs_installer | 47 +-
install/installer/rest_installer | 29 +-
install/installer/traf_add_kerberos | 2 +-
install/installer/traf_add_ldap | 16 +-
.../installer/traf_authentication_conf_default | 4 +-
install/installer/traf_cloudera_mods | 2 +-
install/installer/traf_config | 30 +-
install/installer/traf_config_check | 4 +-
install/installer/traf_config_setup | 12 +-
install/installer/traf_hortonworks_mods | 10 -
install/installer/traf_secure | 20 +-
install/installer/traf_sqgen | 10 +-
install/installer/traf_start | 18 +-
install/installer/trafodion_config_default | 2 +-
install/installer/trafodion_install | 6 +-
install/installer/trafodion_uninstaller | 8 +-
install/python-installer/README.md | 2 +-
install/python-installer/apache_mods.py | 72 -
install/python-installer/bashrc.template | 79 -
install/python-installer/common.py | 478 --
.../configs/db_config_default.ini | 128 +
.../python-installer/configs/default_ports.ini | 25 +
install/python-installer/configs/mod_cfgs.json | 59 +
install/python-installer/configs/prompt.json | 236 +
install/python-installer/configs/script.json | 87 +
install/python-installer/configs/version.json | 10 +
install/python-installer/copy_files.py | 64 -
install/python-installer/db_config_default | 120 -
install/python-installer/db_install.py | 138 +-
install/python-installer/db_uninstall.py | 114 +
install/python-installer/dcs_setup.py | 114 -
install/python-installer/discovery.py | 12 +-
install/python-installer/hadoop_mods.py | 203 -
install/python-installer/hdfs_cmds.py | 68 -
install/python-installer/mod_cfgs.json | 73 -
install/python-installer/prettytable.py | 1475 ++++++
install/python-installer/prompt.json | 227 -
install/python-installer/script.json | 87 -
install/python-installer/scripts/__init__.py | 0
install/python-installer/scripts/apache_mods.py | 72 +
install/python-installer/scripts/common.py | 534 +++
install/python-installer/scripts/copy_files.py | 76 +
install/python-installer/scripts/dcs_setup.py | 105 +
install/python-installer/scripts/hadoop_mods.py | 184 +
install/python-installer/scripts/hdfs_cmds.py | 68 +
.../scripts/httplib2/__init__.py | 1714 +++++++
.../scripts/httplib2/iri2uri.py | 132 +
.../python-installer/scripts/httplib2/socks.py | 438 ++
install/python-installer/scripts/traf_check.py | 87 +
install/python-installer/scripts/traf_dep.py | 106 +
.../python-installer/scripts/traf_discover.py | 269 ++
.../python-installer/scripts/traf_kerberos.py | 118 +
install/python-installer/scripts/traf_ldap.py | 72 +
.../python-installer/scripts/traf_package.py | 50 +
install/python-installer/scripts/traf_setup.py | 137 +
.../python-installer/scripts/traf_sqconfig.py | 77 +
install/python-installer/scripts/traf_start.py | 80 +
install/python-installer/scripts/traf_user.py | 158 +
install/python-installer/scripts/wrapper.py | 274 ++
.../traf_authentication_conf.template | 71 -
install/python-installer/traf_check.py | 87 -
install/python-installer/traf_dep.py | 110 -
install/python-installer/traf_discover.py | 253 -
install/python-installer/traf_kerberos.py | 116 -
install/python-installer/traf_ldap.py | 73 -
install/python-installer/traf_package.py | 47 -
install/python-installer/traf_setup.py | 125 -
install/python-installer/traf_sqconfig.py | 74 -
install/python-installer/traf_start.py | 70 -
install/python-installer/traf_user.py | 146 -
install/python-installer/version.json | 10 -
install/python-installer/wrapper.py | 301 --
licenses/Makefile | 7 +-
licenses/lic-pyinstall-src | 63 +
licenses/lic-server-src | 29 +-
tests/phx/README.rst | 4 +-
tests/phx/phoenix_test.py | 6 +-
tests/phx/pom.xml.template | 8 +-
win-odbc64/odbcclient/drvr35/cdesc.cpp | 25 +-
win-odbc64/odbcclient/drvr35/cdesc.h | 6 +-
win-odbc64/odbcclient/drvr35/cdiag.cpp | 12 +-
win-odbc64/odbcclient/drvr35/ctosqlconv.cpp | 43 +-
win-odbc64/odbcclient/drvr35/ctosqlconv.h | 2 +-
win-odbc64/odbcclient/drvr35/sqltocconv.cpp | 454 +-
wms/conf/wms-env.sh | 6 +-
919 files changed, 69957 insertions(+), 43842 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/export/include/common/evl_sqlog_eventnum.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/monitor/linux/clusterconf.cxx
----------------------------------------------------------------------
diff --cc core/sqf/monitor/linux/clusterconf.cxx
index 1c9fde9,7137e50..3f96015
mode 100644,100755..100644
--- a/core/sqf/monitor/linux/clusterconf.cxx
+++ b/core/sqf/monitor/linux/clusterconf.cxx
@@@ -502,146 -610,48 +502,146 @@@ bool CClusterConfig::DeleteDbUniqueStri
}
else
{
- return( false );
+ sqlite3_bind_int( prepStmtA, 1, nid );
+
+ rc = sqlite3_step( prepStmtA );
+ if (( rc != SQLITE_DONE ) && ( rc != SQLITE_ROW )
+ && ( rc != SQLITE_CONSTRAINT ) )
+ {
+ rs = false;
+ char buf[MON_STRING_BUF_SIZE];
+ snprintf( buf, sizeof(buf), "[%s] delete from monRegUniqueStrings "
+ "value (nid=%d) failed, error=%s (%d)\n"
+ , method_name
+ , nid
+ , sqlite3_errmsg(db_), rc );
+ mon_log_write( MON_CLUSTERCONF_DELETEDBUSTRING_2, SQ_LOG_ERR, buf );
+ }
}
-
+
+ if ( prepStmtA != NULL )
+ sqlite3_finalize( prepStmtA );
+
TRACE_EXIT;
- return( true );
+ return( rs );
}
-bool CClusterConfig::ParsePNid( void )
+// The following method maps the 'sqconfig' text file persist section's
+// <persist-key>_PROCESS_TYPE string value to the internal
+// PROCESSTYPE enum value
+PROCESSTYPE CClusterConfig::GetProcessType( const char *processtype )
{
- int pnid;
- const char method_name[] = "CClusterConfig::ParsePNid";
- TRACE_ENTRY;
-
- // Token: PNID
- cmdTail_ = GetToken( cmdTail_, token_, &delimiter_ );
- if ( strlen( token_ ) >= 1 )
+ if (strcmp( "DTM", processtype) == 0)
{
- if ( isdigit( *token_ ) )
- {
- pnid = atoi( token_ );
- if ( currPNid_ != pnid )
- {
- if ( ! spareNode_ && excludedNid_ && excludedProcessor_ )
- {
- excludedCores_ = true;
- prevExcludedCoreMask_ = excludedCoreMask_;
- CPU_ZERO( &excludedCoreMask_ );
- excludedNid_ = excludedProcessor_ = false;
- }
- prevPNid_ = currPNid_;
- currPNid_ = pnid;
- gatherSpares_ = newPNodeConfig_ = true;
- }
- }
- else
+ return(ProcessType_DTM);
+ }
+ else if (strcmp( "GENERIC", processtype) == 0)
+ {
+ return(ProcessType_Generic);
+ }
+ else if (strcmp( "WDG", processtype) == 0)
+ {
+ return(ProcessType_Watchdog);
+ }
+ else if (strcmp( "MXOSRVR", processtype) == 0)
+ {
+ return(ProcessType_MXOSRVR);
+ }
+ else if (strcmp( "SPX", processtype) == 0)
+ {
+ return(ProcessType_SPX);
+ }
+ else if (strcmp( "SSMP", processtype) == 0)
+ {
+ return(ProcessType_SSMP);
+ }
+ else if (strcmp( "PSD", processtype) == 0)
+ {
+ return(ProcessType_PSD);
+ }
+ else if (strcmp( "SMS", processtype) == 0)
+ {
+ return(ProcessType_SMS);
+ }
+ else if (strcmp( "TMID", processtype) == 0)
+ {
+ return(ProcessType_TMID);
+ }
+ else if (strcmp( "PERSIST", processtype) == 0)
+ {
+ return(ProcessType_PERSIST);
+ }
+
+ return(ProcessType_Undefined);
+}
+
+bool CClusterConfig::Initialize( void )
+{
+ const char method_name[] = "CClusterConfig::Initialize";
+ TRACE_ENTRY;
+
+ if ( db_ != NULL )
+ {
+ // Already initialized
+ return( true );
+ }
+
+ char dbase[MAX_PROCESS_PATH];
+
+ // Open the configuration database file
+ char *configenv = getenv("SQ_CONFIGDB");
+ if (configenv != NULL)
+ {
+ snprintf( dbase, sizeof(dbase), "%s", configenv);
+ }
+ else
+ {
+ snprintf( dbase, sizeof(dbase)
- , "%s/sql/scripts/sqconfig.db", getenv("MY_SQROOT"));
++ , "%s/sql/scripts/sqconfig.db", getenv("TRAF_HOME"));
+ }
+ int rc = sqlite3_open_v2( dbase, &db_
+ , SQLITE_OPEN_READWRITE | SQLITE_OPEN_FULLMUTEX
+ , NULL);
+ if ( rc )
+ {
+ db_ = NULL;
+
+ // See if database is in current directory
+ int rc2 = sqlite3_open_v2( "sqconfig.db", &db_
+ , SQLITE_OPEN_READWRITE | SQLITE_OPEN_FULLMUTEX
+ , NULL);
+ if ( rc2 )
{
- return( false );
+ char la_buf[MON_STRING_BUF_SIZE];
+ snprintf( la_buf, sizeof(la_buf)
+ , "[%s], Can't open configuration database %s, %s\n"
+ , method_name, dbase, sqlite3_errmsg(db_) );
+ mon_log_write( MON_CLUSTERCONF_INIT_1, SQ_LOG_CRIT, la_buf );
}
}
- else
+
+ if ( db_ != NULL )
{
- return( false );
+ rc = sqlite3_busy_timeout(db_, 1000);
+ if ( rc )
+ {
+ char la_buf[MON_STRING_BUF_SIZE];
+ snprintf( la_buf, sizeof(la_buf)
+ , "[%s] Can't set busy timeout for database %s, %s\n"
+ , method_name, dbase, sqlite3_errmsg(db_) );
+ mon_log_write( MON_CLUSTERCONF_INIT_2, SQ_LOG_ERR, la_buf );
+ }
+
+ char *sErrMsg = NULL;
+ sqlite3_exec(db_, "PRAGMA synchronous = OFF", NULL, NULL, &sErrMsg);
+ if (sErrMsg != NULL)
+ {
+ char la_buf[MON_STRING_BUF_SIZE];
+ snprintf( la_buf, sizeof(la_buf)
+ , "[%s] Can't set PRAGMA synchronous for database %s, %s\n"
+ , method_name, dbase, sErrMsg );
+ mon_log_write( MON_CLUSTERCONF_INIT_3, SQ_LOG_ERR, la_buf );
+ }
}
TRACE_EXIT;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/monitor/linux/macros.gmk
----------------------------------------------------------------------
diff --cc core/sqf/monitor/linux/macros.gmk
index 051e9df,e5324f1..e5324f1
mode 100644,100755..100644
--- a/core/sqf/monitor/linux/macros.gmk
+++ b/core/sqf/monitor/linux/macros.gmk
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/monitor/linux/makefile
----------------------------------------------------------------------
diff --cc core/sqf/monitor/linux/makefile
index 0660414,614b945..e5b6a03
mode 100644,100755..100644
--- a/core/sqf/monitor/linux/makefile
+++ b/core/sqf/monitor/linux/makefile
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/monitor/linux/monitor.cxx
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/monitor/linux/monlogging.cxx
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/monitor/linux/pnode.cxx
----------------------------------------------------------------------
diff --cc core/sqf/monitor/linux/pnode.cxx
index 4cacc7a,e1f620a..4fc35e6
mode 100644,100755..100644
--- a/core/sqf/monitor/linux/pnode.cxx
+++ b/core/sqf/monitor/linux/pnode.cxx
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/monitor/linux/pnodeconfig.cxx
----------------------------------------------------------------------
diff --cc core/sqf/monitor/linux/pnodeconfig.cxx
index dcd67aa,f91c9d1..9d5b740
mode 100644,100755..100644
--- a/core/sqf/monitor/linux/pnodeconfig.cxx
+++ b/core/sqf/monitor/linux/pnodeconfig.cxx
@@@ -565,3 -410,52 +565,58 @@@ void CPNodeConfigContainer::GetSpareNod
TRACE_EXIT;
}
-int CPNodeConfigContainer::hostnamecmp(const char *p_str1,
- const char *p_str2)
++int CPNodeConfigContainer::hostnamecmp( const char *p_str1, const char *p_str2 )
+ {
- static bool sb_first_time = true;
- static bool sb_strict_hostname_check = false;
- if (sb_first_time) {
- sb_first_time = false;
- char *lv_envvar=getenv("MON_STRICT_HOSTNAME_CHECK");
-
- if (lv_envvar && (atoi(lv_envvar) == 1)) {
- sb_strict_hostname_check = true;
++ static bool sb_first_time = true;
++ static bool sb_strict_hostname_check = false;
++ if ( sb_first_time )
++ {
++ sb_first_time = false;
++ char *lv_envvar=getenv( "MON_STRICT_HOSTNAME_CHECK" );
++
++ if ( lv_envvar && (atoi( lv_envvar ) == 1) )
++ {
++ sb_strict_hostname_check = true;
++ }
++ }
++
++ if ( !p_str1 ) return 1;
++ if ( !p_str2 ) return 1;
++
++ int lv_ret = strcmp( p_str1, p_str2 );
++ if ( lv_ret == 0 )
++ {
++ return lv_ret;
++ }
++ if ( sb_strict_hostname_check )
++ {
++ return lv_ret;
++ }
++
++ char lv_str1_to_cmp[1024];
++ char lv_str2_to_cmp[1024];
++ memset( lv_str1_to_cmp, 0, 1024 );
++ memset( lv_str2_to_cmp, 0, 1024 );
++
++ char *lp_str1_dot = strchr( (char *) p_str1, '.' );
++ if ( lp_str1_dot )
++ {
++ memcpy( lv_str1_to_cmp, p_str1, lp_str1_dot - p_str1 );
++ }
++ else
++ {
++ strcpy( lv_str1_to_cmp, p_str1 );
++ }
++
++ char *lp_str2_dot = strchr( (char *) p_str2, '.' );
++ if ( lp_str2_dot )
++ {
++ memcpy( lv_str2_to_cmp, p_str2, lp_str2_dot - p_str2 );
++ }
++ else
++ {
++ strcpy( lv_str2_to_cmp, p_str2 );
+ }
- }
-
- if (!p_str1) return 1;
- if (!p_str2) return 1;
-
- int lv_ret = strcmp(p_str1, p_str2);
- if (lv_ret == 0) {
- return lv_ret;
- }
- if (sb_strict_hostname_check) {
- return lv_ret;
- }
-
- char lv_str1_to_cmp[1024];
- char lv_str2_to_cmp[1024];
- memset(lv_str1_to_cmp, 0, 1024);
- memset(lv_str2_to_cmp, 0, 1024);
-
- char *lp_str1_dot = strchr((char *) p_str1, '.');
- if (lp_str1_dot) {
- memcpy(lv_str1_to_cmp, p_str1, lp_str1_dot - p_str1);
- }
- else {
- strcpy(lv_str1_to_cmp, p_str1);
- }
-
- char *lp_str2_dot = strchr((char *) p_str2, '.');
- if (lp_str2_dot) {
- memcpy(lv_str2_to_cmp, p_str2, lp_str2_dot - p_str2);
- }
- else {
- strcpy(lv_str2_to_cmp, p_str2);
- }
-
- return strcmp(lv_str1_to_cmp, lv_str2_to_cmp);
+
++ return strcmp( lv_str1_to_cmp, lv_str2_to_cmp );
+ }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/monitor/linux/pnodeconfig.h
----------------------------------------------------------------------
diff --cc core/sqf/monitor/linux/pnodeconfig.h
index f0992cd,d4e59c2..d239513
mode 100644,100755..100644
--- a/core/sqf/monitor/linux/pnodeconfig.h
+++ b/core/sqf/monitor/linux/pnodeconfig.h
@@@ -35,22 -35,15 +35,23 @@@ typedef list<CPNodeConfig *> PNodesCo
class CPNodeConfigContainer
{
public:
- CPNodeConfigContainer( void );
+ CPNodeConfigContainer( int pnodesConfigMax );
~CPNodeConfigContainer( void );
- static int hostnamecmp(const char *p_str1, const char *p_str2);
- CPNodeConfig *AddPNodeConfig( int pnid, char *name, bool spare );
+ CPNodeConfig *AddPNodeConfig( int pnid
+ , char *name
+ , int excludedFirstCore
+ , int excludedLastCore
+ , bool spare );
+ void Clear( void );
++ static int hostnamecmp(const char *p_str1, const char *p_str2);
void DeletePNodeConfig( CPNodeConfig *pnodeConfig );
inline CPNodeConfig *GetFirstPNodeConfig( void ) { return ( head_ ); }
+ inline int GetNextPNid( void ) { return ( nextPNid_ ); }
int GetPNid( char *nodename );
+ CPNodeConfig *GetPNodeConfig( char *nodename );
CPNodeConfig *GetPNodeConfig( int pnid );
+ inline int GetPNodesConfigMax( void ) { return ( pnodesConfigMax_ ); }
inline int GetPNodesCount( void ) { return ( pnodesCount_ ); }
inline int GetSNodesCount( void ) { return ( snodesCount_ ); }
inline PNodesConfigList_t *GetSpareNodesConfigList( void ) { return ( &spareNodesConfigList_ ); }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/monitor/linux/process.cxx
----------------------------------------------------------------------
diff --cc core/sqf/monitor/linux/process.cxx
index eface3b,0ebe54c..a2eef47
mode 100644,100755..100644
--- a/core/sqf/monitor/linux/process.cxx
+++ b/core/sqf/monitor/linux/process.cxx
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/monitor/linux/process.h
----------------------------------------------------------------------
diff --cc core/sqf/monitor/linux/process.h
index 3a63197,957f218..d6a56bd
mode 100644,100755..100644
--- a/core/sqf/monitor/linux/process.h
+++ b/core/sqf/monitor/linux/process.h
@@@ -460,9 -457,8 +460,9 @@@ private
string program_; // object file name
strId_t pathStrId_;
strId_t ldpathStrId_;
+ bool firstInstance_; // reset on persistent process re-creation
bool cmpOrEsp_;
- string sqRoot_; // MY_SQROOT passed to object file
+ string sqRoot_; // TRAF_HOME passed to object file
string infile_; // process's stdin
string outfile_; // process's stdout
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/monitor/linux/pstartd.cxx
----------------------------------------------------------------------
diff --cc core/sqf/monitor/linux/pstartd.cxx
index 4f36e11,c09ba65..da72c8b
mode 100644,100755..100644
--- a/core/sqf/monitor/linux/pstartd.cxx
+++ b/core/sqf/monitor/linux/pstartd.cxx
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9523fd2b/core/sqf/monitor/linux/reqqueue.cxx
----------------------------------------------------------------------
diff --cc core/sqf/monitor/linux/reqqueue.cxx
index 196f490,2684633..e681e34
--- a/core/sqf/monitor/linux/reqqueue.cxx
+++ b/core/sqf/monitor/linux/reqqueue.cxx
@@@ -2464,9 -2164,21 +2464,23 @@@ void CIntSnapshotReq::performRequest(
abort();
}
++#if 0
+ // copy sqconfig.db
+ char cmd[256];
+ sprintf(cmd, "pdcp -p -w %s %s/sql/scripts/sqconfig.db %s/sql/scripts/.", Monitor->GetIntegratingNode()->GetName(),
+ getenv("TRAF_HOME"), getenv("TRAF_HOME") );
+
+ error = system(cmd);
+
+ if (trace_settings & TRACE_REQUEST)
+ trace_printf("%s@%d - Copied config.db (%s) Error = %d\n", method_name, __LINE__, cmd, error);
+
+ mem_log_write(MON_REQQUEUE_SNAPSHOT_3, error);
-
++#endif
++
// estimate size of snapshot buffer
// about 100 bytes per process, 1.5 times total
- int procSize = Nodes->ProcessCount() * 1.5 * 100;
+ int procSize = Nodes->ProcessCount() * 1.75 * 100;
int spareNodeSize = Nodes->GetSpareNodesList()->size() * sizeof(int); // pnids
if (trace_settings & (TRACE_REQUEST | TRACE_INIT | TRACE_RECOVERY))