You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2015/10/30 16:50:50 UTC
[2/5] incubator-trafodion git commit: Merge remote branch
'github/master' into MDAMfix
Merge remote branch 'github/master' into MDAMfix
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0b3c7068
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0b3c7068
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0b3c7068
Branch: refs/heads/master
Commit: 0b3c70684b6520778ede920b701402f79f6655a4
Parents: 298ddd4 af7809d
Author: Qifan Chen <qf...@dev02.trafodion.org>
Authored: Thu Oct 29 14:51:11 2015 +0000
Committer: Qifan Chen <qf...@dev02.trafodion.org>
Committed: Thu Oct 29 14:51:11 2015 +0000
----------------------------------------------------------------------
core/rest/pom.xml | 6 +-
core/sqf/sqenvcom.sh | 28 +-
core/sqf/sql/scripts/genms | 3 +
core/sqf/sql/scripts/install_local_hadoop | 13 +-
.../transactional/SplitBalanceHelper.java | 2 +-
core/sql/comexe/ComTdbHbaseAccess.cpp | 4 +-
core/sql/comexe/ComTdbHbaseAccess.h | 6 +
core/sql/executor/ExHbaseIUD.cpp | 6 +-
core/sql/generator/GenExplain.cpp | 8 +
core/sql/generator/GenRelUpdate.cpp | 9 +
core/sql/generator/GenUdr.cpp | 5 +-
core/sql/optimizer/NAColumn.cpp | 4 +-
core/sql/optimizer/NAColumn.h | 2 +-
core/sql/regress/hive/EXPECTED020 | 63 +-
core/sql/regress/hive/TEST020 | 27 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 2 +-
core/sql/sqlcomp/DefaultConstants.h | 1 +
core/sql/sqlcomp/nadefaults.cpp | 1 +
core/sql/sqludr/SqlUdrPredefLogReader.cpp | 983 +--
dcs/bin/dcs-daemon.sh | 6 +-
dcs/pom.xml | 8 +-
.../dcs/tmpl/server/ServerStatusTmpl.jamon | 7 +-
.../dcs/tmpl/servermt/ServerStatusTmpl.jamon | 7 +-
.../org/trafodion/dcs/master/ServerManager.java | 3 +-
.../resources/dcs-webapps/master/servers.jsp | 17 +-
.../java/org/trafodion/jdbc_test/TestCat.java | 4 +-
install/installer/traf_start | 31 +-
install/traf_tools_setup.sh | 378 +-
pom.xml | 2 +-
.../SetCertificateDirReg.rc | 222 +-
.../SetCertificateDirReg_os.vcxproj | 390 +-
.../SetCertificateDirReg_os.vcxproj.filters | 104 +-
.../SetCertificateDirReg_os.vcxproj.user | 4 +-
.../SetCertificateDirReg/odbccp32.props | 34 +-
.../SetCertificateDirReg/resource.h | 40 +-
.../SetCertificateDirReg_os.sln | 52 +-
.../Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp | 200 -
.../UpdateDSN/UpdateDSN/UpdateDSN.vcxproj | 170 -
.../UpdateDSN/UpdateDSN.vcxproj.filters | 33 -
.../UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj | 104 -
.../UpdateDSN/UpdateDSN_os.vcxproj.filters | 33 -
.../UpdateDSN/UpdateDSN_os.vcxproj.user | 3 -
.../Install/UpdateDSN/UpdateDSN/stdafx.cpp | 28 -
win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h | 37 -
win-odbc64/Install/UpdateDSN/UpdateDSN_os.sln | 26 -
.../Install/win64_installer/installer.iss | 200 +
.../win64_installer/win64_installer_os.ism | 6029 ------------------
win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc | 12 +-
.../odbcclient/Drvr35Res/Drvr35Res_os.vcxproj | 4 +-
.../odbcclient/Drvr35Res/res/Drvr35Res.rc2 | 26 +-
win-odbc64/odbcclient/README.txt | 111 +-
.../odbcclient/TranslationDll/TranslationDll.rc | 12 +-
.../TranslationDll/TranslationDll_os.vcxproj | 4 +-
win-odbc64/odbcclient/build_os.bat | 333 +-
win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC | 12 +-
.../drvr35/TCPIPV4/TCPIPV4_os.vcxproj | 8 +-
win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC | 12 +-
.../drvr35/TCPIPV6/TCPIPV6_os.vcxproj | 8 +-
win-odbc64/odbcclient/drvr35/drvr35.rc | 12 +-
win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj | 16 +-
.../odbcclient/drvr35adm/Drvr35Adm_os.vcxproj | 5 +-
win-odbc64/odbcclient/drvr35adm/drvr35adm.rc | 12 +-
win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp | 2 +-
.../odbcclient/drvr35adm/tabpagenetwork.cpp | 2 +-
win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc | 12 +-
.../odbcclient/drvr35msg/Drvr35Msg_os.vcxproj | 4 +-
win-odbc64/odbcclient/odbcclient_os.sln | 17 +-
win-odbc64/odbcclient/pkg.bat | 38 -
68 files changed, 1868 insertions(+), 8139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0b3c7068/core/sql/optimizer/NAColumn.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0b3c7068/core/sql/optimizer/NAColumn.h
----------------------------------------------------------------------
diff --cc core/sql/optimizer/NAColumn.h
index 32a479d,1573cb9..effef05
--- a/core/sql/optimizer/NAColumn.h
+++ b/core/sql/optimizer/NAColumn.h
@@@ -631,11 -631,8 +631,11 @@@ public
// numeric > 0. This method is used during alter table add
// column to find the maximum value currently in use. Columns
// are deleted during alter table drop column.
- Lng32 getMaxTrafHbaseColQualifier() const;
+ ULng32 getMaxTrafHbaseColQualifier() const;
+ NAString getColumnNamesAsString(char separator) const;
+ NAString getColumnNamesAsString(char separator, UInt32 ct) const;
+
private:
ARRAY(NABoolean) ascending_; // ignore for non-key or hash key columns
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0b3c7068/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0b3c7068/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------