Merge remote branch 'origin/master' into trafodion-1896
Conflicts:
core/sql/regress/seabase/EXPECTED020
core/sql/sqlcomp/DefaultConstants.h
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/99224ddd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/99224ddd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/99224ddd
Branch: refs/heads/master
Commit: 99224dddd97ac3910a8b25a7d765e8be50695c1e
Parents: 445f690 f918a26
Author: selvaganesang <[email protected]>
Authored: Wed Mar 30 16:30:36 2016 +0000
Committer: selvaganesang <[email protected]>
Committed: Wed Mar 30 16:30:36 2016 +0000
----------------------------------------------------------------------
.../java/org/trafodion/jdbc/t2/BaseRow.java | 67 -
.../java/org/trafodion/jdbc/t2/InsertRow.java | 89 -
.../main/java/org/trafodion/jdbc/t2/Row.java | 275 --
core/conn/odbc/src/odbc/nsksrvr/Makefile | 2 +
.../odbc/src/odbc/nsksrvrcore/csrvrstmt.cpp | 7 +-
core/sqf/monitor/linux/cluster.cxx | 11 +
core/sqf/monitor/linux/cmsh.cxx | 29 +-
core/sqf/monitor/linux/config.cxx | 1 +
core/sqf/monitor/linux/internal.h | 9 +
core/sqf/monitor/linux/makefile | 5 +-
core/sqf/monitor/linux/mlio.cxx | 6 +-
core/sqf/monitor/linux/monitor.cxx | 3 +
core/sqf/monitor/linux/msgdef.h | 17 +
core/sqf/monitor/linux/phnode.h | 2 +
core/sqf/monitor/linux/pnode.cxx | 10 +
core/sqf/monitor/linux/pnode.h | 1 +
core/sqf/monitor/linux/pnodeconfig.cxx | 6 +
core/sqf/monitor/linux/pnodeconfig.h | 2 +-
core/sqf/monitor/linux/replicate.cxx | 56 +-
core/sqf/monitor/linux/replicate.h | 14 +
core/sqf/monitor/linux/reqnodename.cxx | 114 +
core/sqf/monitor/linux/reqqueue.cxx | 60 +-
core/sqf/monitor/linux/reqqueue.h | 32 +-
core/sqf/monitor/linux/shell.cxx | 177 +-
core/sqf/monitor/linux/testpoint.h | 2 +-
core/sqf/sql/scripts/ilh_cleanhb | 106 +
core/sqf/sql/scripts/ilh_hbase_repair | 65 +
core/sqf/sql/scripts/ilh_hbcheck | 72 +
core/sqf/sql/scripts/ilh_traf_restart | 117 +
core/sqf/sql/scripts/ilh_trafinit | 108 +
.../sql/scripts/install_hadoop_regr_test_env | 4 +-
core/sqf/sql/scripts/install_local_hadoop | 5 +
core/sqf/sql/scripts/trafnodestatus | 105 +
core/sqf/sql/scripts/trafnodestatus.awk | 76 +
core/sqf/src/seabed/src/sautil.cpp | 5 -
core/sqf/src/seabed/src/stream.cpp | 2 -
core/sqf/tools/sqtools.sh | 56 +
core/sql/bin/SqlciErrors.txt | 7 +-
core/sql/comexe/ComTdbHbaseAccess.h | 27 +-
core/sql/common/ComMisc.cpp | 14 +
core/sql/common/ComMisc.h | 8 +
core/sql/common/ComSmallDefs.h | 5 +
core/sql/executor/ExHbaseSelect.cpp | 19 +-
core/sql/exp/exp_conv.cpp | 1 +
core/sql/exp/exp_datetime.cpp | 11 +-
core/sql/exp/exp_datetime.h | 1 +
core/sql/generator/GenPreCode.cpp | 5 +-
core/sql/generator/GenRelScan.cpp | 2 +-
core/sql/generator/Generator.cpp | 8 +-
core/sql/optimizer/BindItemExpr.cpp | 2 +-
core/sql/optimizer/NATable.cpp | 4 +-
core/sql/optimizer/SynthType.cpp | 14 +-
core/sql/parser/ElemDDLCol.cpp | 542 ++--
core/sql/parser/ElemDDLColDef.h | 14 +-
core/sql/parser/StmtDDLCreate.cpp | 7 +-
core/sql/parser/sqlparser.y | 48 +-
core/sql/regress/charsets/EXPECTED002 | 6 +-
core/sql/regress/charsets/EXPECTED310 | 198 +-
core/sql/regress/charsets/EXPECTED312 | 198 +-
core/sql/regress/charsets/EXPECTED313 | 286 ++-
.../sql/regress/compGeneral/DIFF006.KNOWN.SB.OS | 2 +-
core/sql/regress/compGeneral/EXPECTED005 | 10 +-
core/sql/regress/compGeneral/EXPECTED006.SB | 22 +-
core/sql/regress/compGeneral/EXPECTED042 | 8 +-
core/sql/regress/core/EXPECTED131 | 89 +-
core/sql/regress/core/TEST131 | 40 +
core/sql/regress/privs1/EXPECTED133 | Bin 22984 -> 26383 bytes
core/sql/regress/privs1/TEST133 | 97 +-
core/sql/regress/seabase/EXPECTED010 | 2 +-
core/sql/regress/seabase/EXPECTED020 | 15 +-
core/sql/regress/seabase/EXPECTED027 | 219 +-
core/sql/regress/seabase/EXPECTED030 | 49 +
core/sql/regress/seabase/EXPECTED031 | 214 ++
core/sql/regress/seabase/TEST010 | 2 +-
core/sql/regress/seabase/TEST020 | 7 +-
core/sql/regress/seabase/TEST027 | 35 +
core/sql/regress/seabase/TEST030 | 7 +
core/sql/regress/seabase/TEST031 | 108 +
core/sql/regress/tools/runregr_udr.ksh | 8 +-
core/sql/regress/udr/EXPECTED103 | 529 ++++
core/sql/regress/udr/TEST103 | 246 ++
core/sql/regress/udr/TEST103_functions.cpp | 191 ++
core/sql/regress/udr/TEST103_procs.java | 224 ++
core/sql/sqlcomp/CmpSeabaseDDL.h | 1 +
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 12 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 23 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 101 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 114 +-
core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 1 -
core/sql/sqlcomp/DefaultConstants.h | 6 +
core/sql/sqlcomp/nadefaults.cpp | 4 +-
core/sql/ustat/hs_globals.cpp | 24 +-
.../src/asciidoc/_chapters/SQuirrel.adoc | 8 +-
.../src/asciidoc/_chapters/about.adoc | 11 +-
.../src/asciidoc/_chapters/dbviz.adoc | 17 +-
.../src/asciidoc/_chapters/introduction.adoc | 130 +-
.../src/asciidoc/_chapters/jdbct4.adoc | 353 ++-
.../src/asciidoc/_chapters/odb.adoc | 49 +-
.../src/asciidoc/_chapters/odbc_linux.adoc | 82 +-
.../src/asciidoc/_chapters/odbc_windows.adoc | 176 +-
.../src/asciidoc/_chapters/sample_prog.adoc | 6 +-
.../src/asciidoc/_chapters/trafci.adoc | 323 ++-
docs/client_install/src/asciidoc/index.adoc | 11 +-
.../src/images/win10_edit_path.jpg | Bin 0 -> 65094 bytes
.../src/images/win10_select_java.jpg | Bin 0 -> 22758 bytes
.../src/asciidoc/_chapters/about.adoc | 4 +-
.../src/asciidoc/_chapters/commands.adoc | 8 +-
.../src/asciidoc/_chapters/install.adoc | 70 +-
.../src/asciidoc/_chapters/interactive.adoc | 56 +-
.../src/asciidoc/_chapters/introduction.adoc | 10 +-
.../src/asciidoc/_chapters/launch.adoc | 148 +-
.../src/asciidoc/_chapters/perlpython.adoc | 72 +-
.../src/asciidoc/_chapters/scripts.adoc | 24 +-
docs/command_interface/src/asciidoc/index.adoc | 4 +
.../src/resources/source/sample.pl | 19 +
.../src/resources/source/sample.py | 29 +
docs/spj_guide/pom.xml | 289 +++
.../spj_guide/src/asciidoc/_chapters/about.adoc | 200 ++
.../src/asciidoc/_chapters/create_spjs.adoc | 508 ++++
.../src/asciidoc/_chapters/deploy_spjs.adoc | 557 ++++
.../src/asciidoc/_chapters/develop_spjs.adoc | 899 +++++++
.../src/asciidoc/_chapters/execute_spjs.adoc | 730 ++++++
.../src/asciidoc/_chapters/get_started.adoc | 121 +
.../asciidoc/_chapters/grant_privileges.adoc | 312 +++
.../src/asciidoc/_chapters/introduction.adoc | 255 ++
.../_chapters/performance_troubleshooting.adoc | 416 +++
.../src/asciidoc/_chapters/sample_database.adoc | 816 ++++++
.../src/asciidoc/_chapters/sample_spjs.adoc | 2386 ++++++++++++++++++
docs/spj_guide/src/asciidoc/index.adoc | 113 +
docs/src/site/markdown/documentation.md | 4 +
docs/src/site/markdown/download.md | 2 +-
install/installer/rest_installer | 11 +-
install/installer/traf_cloudera_mods98 | 64 +-
install/installer/traf_config_check | 7 +-
install/installer/traf_createPasswordLessSSH | 6 +-
install/installer/traf_getHadoopNodes | 105 +-
install/installer/traf_hortonworks_mods98 | 101 +-
.../installer/trafodion_apache_hadoop_install | 12 +-
install/installer/trafodion_install | 12 -
install/installer/trafodion_uninstaller | 10 +-
pom.xml | 4 +-
141 files changed, 12949 insertions(+), 2156 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/99224ddd/core/sql/regress/seabase/EXPECTED020
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/99224ddd/core/sql/regress/seabase/TEST020
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/99224ddd/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
diff --cc core/sql/sqlcomp/DefaultConstants.h
index c212256,7e20226..479c2a5
--- a/core/sql/sqlcomp/DefaultConstants.h
+++ b/core/sql/sqlcomp/DefaultConstants.h
@@@ -3801,8 -3801,16 +3801,14 @@@ enum DefaultConstant
// If this cqd is on, then other alters (name, datatype) are also supported.
TRAF_ALTER_COL_ATTRS,
++ // Controls the behavior of upsert - MERGE, REPLACE, OPTIMAL
+ TRAF_UPSERT_MODE,
+ // if set, let users create system reserved names. Default is OFF.
+ // This cqd should only be used to debug or if system column names are
+ // REALLY needed by users.
+ // Currently syskey, _salt_, _division_.
+ TRAF_ALLOW_RESERVED_COLNAMES,
- // if ON, upsert into the table will use the default value for the omitted
columns
- // with default value
- TRAF_UPSERT_WITH_INSERT_DEFAULT_SEMANTICS,
-
// This enum constant must be the LAST one in the list; it's a count,
// not an Attribute (it's not IN DefaultDefaults; it's the SIZE of it)!
__NUM_DEFAULT_ATTRIBUTES
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/99224ddd/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
