merge [TRAFODION-3041] Support watchdog query cache
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/fe62cce7 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/fe62cce7 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/fe62cce7 Branch: refs/heads/master Commit: fe62cce7871b58b1fc6e3fad258b008d84c2e903 Parents: 2477de3 f8c90f3 Author: Liu Ming <[email protected]> Authored: Fri May 4 10:33:27 2018 +0000 Committer: Liu Ming <[email protected]> Committed: Fri May 4 10:33:27 2018 +0000 ---------------------------------------------------------------------- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 327 +++++++++++++++---- core/conn/odbc/src/odbc/nsksrvr/SrvrMain.cpp | 23 ++ .../main/java/org/trafodion/dcs/Constants.java | 7 +- .../org/trafodion/dcs/server/ServerManager.java | 6 + dcs/src/main/resources/dcs-default.xml | 8 + 5 files changed, 303 insertions(+), 68 deletions(-) ----------------------------------------------------------------------
