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:23 UTC
[22/50] [abbrv] incubator-trafodion git commit: Merge remote branch
'origin/master' into TRAFODION-2001
Merge remote branch 'origin/master' into TRAFODION-2001
Conflicts:
install/installer/addNode_step2
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6fb4a506
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6fb4a506
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6fb4a506
Branch: refs/heads/master
Commit: 6fb4a5062f3ca5f552ae17f219287db75f49574c
Parents: 8fad692 fe07eda
Author: Zalo Correa <za...@esgyn.com>
Authored: Wed Oct 26 13:26:49 2016 -0700
Committer: Zalo Correa <za...@esgyn.com>
Committed: Wed Oct 26 13:26:49 2016 -0700
----------------------------------------------------------------------
.gitignore | 1 +
core/Makefile | 54 +-
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 26 +
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 40 +-
core/sqf/conf/log4cxx.trafodion.tm.config | 2 +-
core/sqf/monitor/linux/cluster.cxx | 104 +-
core/sqf/monitor/linux/internal.h | 3 +-
core/sqf/monitor/linux/monitor.cxx | 1 +
core/sqf/monitor/linux/pnode.cxx | 2 -
core/sqf/monitor/linux/pnode.h | 7 +-
core/sqf/monitor/linux/zclient.cxx | 41 +
core/sqf/sqenvcom.sh | 12 +-
core/sqf/sql/scripts/install_local_hadoop | 24 +-
core/sqf/sql/scripts/sqgen | 15 +-
.../sqf/sql/scripts/traf_coprocessor.properties | 26 -
core/sqf/sql/scripts/trafodion-site.xml | 38 +
core/sqf/src/seatrans/hbase-trx/Makefile | 6 +-
.../sqf/src/seatrans/hbase-trx/pom.xml.apache10 | 2 +-
.../sqf/src/seatrans/hbase-trx/pom.xml.apache11 | 2 +-
.../sqf/src/seatrans/hbase-trx/pom.xml.apache12 | 2 +-
.../transactional/TransactionManager.java | 607 +++++----
.../client/transactional/TransactionState.java | 79 +-
.../transactional/TrxRegionEndpoint.java.tmpl | 2 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 6 +-
.../java/org/trafodion/dtm/TmAuditTlog.java | 11 +-
.../main/java/org/trafodion/dtm/TrafInfo.java | 4 +-
.../org/trafodion/sql/TrafConfiguration.java | 1 +
core/sqf/src/tm/tmmsg.h | 21 +-
core/sqf/src/tm/tmtx.cpp | 4 +-
core/sql/bin/SqlciErrors.txt | 2 +-
core/sql/cli/CliExtern.cpp | 7 +
core/sql/common/ComDistribution.cpp | 3 +-
core/sql/common/ComSecurityKey.cpp | 4 +-
core/sql/common/ComSecurityKey.h | 2 +-
core/sql/common/ComSmallDefs.h | 2 +
core/sql/exp/exp_clause_derived.h | 6 +
core/sql/exp/exp_fixup.cpp | 110 +-
core/sql/optimizer/NATable.cpp | 230 ++--
core/sql/optimizer/NATable.h | 175 +--
core/sql/optimizer/opt.cpp | 21 +-
core/sql/optimizer/opt.h | 16 +-
core/sql/parser/sqlparser.y | 11 -
core/sql/qmscommon/QRLogger.cpp | 3 +
core/sql/regress/compGeneral/EXPECTED011.SB | 8 +-
core/sql/regress/compGeneral/EXPECTED015.SB | 292 +++--
core/sql/regress/compGeneral/EXPECTED042 | 83 +-
core/sql/regress/core/EXPECTED005.SB | 4 +-
core/sql/regress/executor/DIFF107.KNOWN.SB | 16 -
core/sql/regress/executor/DIFF107.KNOWN.SB.OS | 14 -
core/sql/regress/executor/EXPECTED107 | 565 ++++++++
core/sql/regress/executor/EXPECTED107.LINUX | 574 --------
core/sql/regress/executor/TEST107 | 51 +-
core/sql/regress/hive/EXPECTED018 | 218 ++--
core/sql/regress/privs1/EXPECTED120 | 1222 ++++++++++++++++++
core/sql/regress/privs1/EXPECTED137 | 216 +++-
core/sql/regress/privs1/TEST120 | 379 ++++++
core/sql/regress/privs1/TEST137 | 53 +-
core/sql/regress/privs2/EXPECTED144 | Bin 0 -> 59186 bytes
core/sql/regress/privs2/LOG144 | Bin 0 -> 17980 bytes
core/sql/regress/privs2/TEST144 | 241 ++++
core/sql/regress/privs2/udfs.cpp | 174 +++
core/sql/regress/seabase/EXPECTED011 | 20 +-
core/sql/regress/seabase/EXPECTED013 | 144 +--
core/sql/regress/udr/TEST103 | 2 +-
core/sql/runtimestats/SqlStats.cpp | 5 +-
core/sql/runtimestats/sscpipc.cpp | 7 +-
core/sql/runtimestats/ssmpipc.cpp | 3 +
core/sql/sort/SortTopN.cpp | 8 +
core/sql/sqlcomp/CmpMain.cpp | 9 +
core/sql/sqlcomp/CmpMain.h | 2 +
core/sql/sqlcomp/CmpSeabaseDDL.h | 2 +
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 9 +
core/sql/sqlcomp/DefaultConstants.h | 7 -
core/sql/sqlcomp/PrivMgrComponentPrivileges.cpp | 76 +-
core/sql/sqlcomp/QCache.cpp | 24 +-
core/sql/sqlcomp/nadefaults.cpp | 18 -
core/sql/sqludr/SqlUdrPredefLogReader.cpp | 482 ++++++-
.../org/trafodion/sql/CoprocessorUtils.java | 104 --
.../java/org/trafodion/sql/HBaseClient.java | 29 +-
.../org/trafodion/sql/TrafConfiguration.java | 70 +
.../java/org/trafodion/sql/TrafRegionStats.java | 4 +-
core/sql/ustat/hs_const.h | 1 +
core/sql/ustat/hs_globals.cpp | 6 +
core/sql/ustat/hs_read.cpp | 44 -
core/sql/ustat/hs_read.h | 32 -
core/sql/ustat/hs_update.cpp | 19 +-
core/trafodion.spec | 114 ++
.../org/trafodion/jdbc_test/TestForeignKey.java | 224 ++++
.../asciidoc/_chapters/update_stats_msgs.adoc | 15 +
install/installer/addNode_step1 | 89 +-
install/installer/addNode_step2 | 102 +-
install/installer/deleteNode | 244 ----
.../Install/win64_installer/installer.iss | 53 +-
win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc | 8 +-
.../odbcclient/TranslationDll/TranslationDll.rc | 8 +-
win-odbc64/odbcclient/build_os.bat | 10 +-
win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC | 8 +-
win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC | 8 +-
win-odbc64/odbcclient/drvr35/cconnect.cpp | 17 +-
win-odbc64/odbcclient/drvr35/cdatasource.cpp | 2 +-
win-odbc64/odbcclient/drvr35/drvr35.rc | 8 +-
win-odbc64/odbcclient/drvr35adm/drvr35adm.h | 2 +-
win-odbc64/odbcclient/drvr35adm/drvr35adm.rc | 8 +-
103 files changed, 5522 insertions(+), 2370 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6fb4a506/core/sqf/monitor/linux/cluster.cxx
----------------------------------------------------------------------
diff --cc core/sqf/monitor/linux/cluster.cxx
index 84768c9,a986b67..3ede266
--- a/core/sqf/monitor/linux/cluster.cxx
+++ b/core/sqf/monitor/linux/cluster.cxx
@@@ -434,13 -446,18 +446,23 @@@ void CCluster::AssignTmLeader(int pnid
continue; // this is the node that is going down, skip it
}
+ if (Node[TmLeaderPNid] == NULL)
+ {
+ continue;
+ }
+
node = Node[TmLeaderPNid];
+ if (trace_settings & (TRACE_INIT | TRACE_RECOVERY | TRACE_REQUEST | TRACE_SYNC | TRACE_TMSYNC))
+ {
+ trace_printf( "%s@%d - Node pnid=%d (%s), phase=%s, isSoftNodeDown=%d\n"
+ , method_name, __LINE__
+ , node->GetPNid()
+ , node->GetName()
+ , NodePhaseString(node->GetPhase())
+ , node->IsSoftNodeDown());
+ }
+
if ( node->IsSpareNode() ||
node->IsSoftNodeDown() ||
node->GetState() != State_Up ||
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6fb4a506/core/sqf/monitor/linux/internal.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6fb4a506/core/sqf/monitor/linux/monitor.cxx
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6fb4a506/core/sqf/monitor/linux/pnode.cxx
----------------------------------------------------------------------
diff --cc core/sqf/monitor/linux/pnode.cxx
index 5fdafc7,d5c8555..4cacc7a
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/6fb4a506/core/sqf/monitor/linux/pnode.h
----------------------------------------------------------------------
diff --cc core/sqf/monitor/linux/pnode.h
index 8c3a5de,607678b..d484b6a
mode 100644,100755..100644
--- a/core/sqf/monitor/linux/pnode.h
+++ b/core/sqf/monitor/linux/pnode.h
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6fb4a506/core/sqf/monitor/linux/zclient.cxx
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6fb4a506/core/sqf/sql/scripts/sqgen
----------------------------------------------------------------------
diff --cc core/sqf/sql/scripts/sqgen
index 1aa0e46,a761f08..2169e60
--- a/core/sqf/sql/scripts/sqgen
+++ b/core/sqf/sql/scripts/sqgen
@@@ -211,10 -187,24 +211,23 @@@ f
./gensqstatem2lenv > $SQETC_DIR/sqstatem2l.env
- cp ./traf_coprocessor.properties $SQETC_DIR/
+ if [ -f $SQETC_DIR/trafodion-site.xml ]; then
+ echo "Trafodion customization file $SQETC_DIR/trafodion-site.xml exists."
+ echo "The file will not be copied."
+ echo
+ else
+ echo "Copying Trafodion customization file: $SQETC_DIR/trafodion-site.xml"
+ echo
+ cp ./trafodion-site.xml $SQETC_DIR
+ lv_retcode=$?
+ if [[ $lv_retcode != 0 ]]; then
+ echo "Error $lv_retcode while copying Exiting..."
+ exit $lv_retcode
+ fi
+ fi
# Create configuration database tables
-rm -f sqconfig.db
-sqlite3 -init createConfigDb sqconfig.db <<eof
+sqlite3 -init createConfigDb $SQCONFIG_DB_FILE <<eof
.quit
eof
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6fb4a506/core/sql/qmscommon/QRLogger.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6fb4a506/install/installer/addNode_step2
----------------------------------------------------------------------