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 2016/02/08 17:41:48 UTC
[2/3] incubator-trafodion git commit: Merge remote branch
'origin/master' into dt_br
Merge remote branch 'origin/master' into dt_br
Conflicts:
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/e612ede7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e612ede7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e612ede7
Branch: refs/heads/master
Commit: e612ede73eb7329f0cb1aec14d9f7e6eacdac2df
Parents: 0c87224 7f33541
Author: Cloud User <ce...@ansharma-1.novalocal>
Authored: Fri Feb 5 19:12:43 2016 +0000
Committer: Cloud User <ce...@ansharma-1.novalocal>
Committed: Fri Feb 5 19:12:43 2016 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvr/Makefile | 2 +-
.../odbc/odbcclient/unixcli/cli/drvrglobal.h | 21 +-
.../unixcli/package/linux64_install.sh | 397 --
core/rest/src/main/asciidoc/_chapters/apis.adoc | 20 +
.../java/org/trafodion/rest/ServerResource.java | 94 +
core/sqf/LocalSettingsTemplate.sh | 3 +
core/sqf/monitor/linux/amqpmon.cxx | 231 -
core/sqf/monitor/linux/amqpmon.h | 71 -
core/sqf/monitor/linux/makefile | 2 +-
core/sqf/sqenvcom.sh | 2 +-
core/sqf/sql/scripts/findPort.py | 40 +-
core/sqf/sql/scripts/genms | 1 +
core/sqf/sql/scripts/install_traf_components | 68 +-
core/sqf/sql/scripts/lsof.awk | 110 +
core/sqf/sql/scripts/restcheck | 70 +
core/sqf/sql/scripts/sqgen | 13 +-
.../sqf/sql/scripts/traf_coprocessor.properties | 26 +
core/sqf/sql/scripts/uninstall_traf_components | 159 +
core/sqf/sqvers | 2 +-
.../transactional/TrxRegionEndpoint.java | 33 +-
.../generated/TrxRegionProtos.java | 230 +-
.../hbase-trx/src/main/protobuf/TrxRegion.proto | 3 +-
.../java/org/trafodion/dtm/TmAuditTlog.java | 9 +-
core/sqf/src/tm/Makefile | 8 +-
core/sqf/src/tm/dtm.events.pb.cc | 1185 -----
core/sqf/src/tm/dtm.events.pb.h | 709 ---
core/sqf/src/tm/dtm.perf_stats.pb.cc | 4081 ------------------
core/sqf/src/tm/dtm.perf_stats.pb.h | 2442 -----------
core/sqf/src/tm/idtmsrv.cpp | 48 +-
core/sql/common/csconvert.cpp | 48 +
core/sql/common/csconvert.h | 4 +
core/sql/exp/exp_clause_derived.h | 4 +-
core/sql/exp/exp_conv.cpp | 26 +
core/sql/generator/GenItemFunc.cpp | 3 +
core/sql/generator/GenRelScan.cpp | 22 +-
core/sql/nskgmake/Makerules.linux | 5 +-
core/sql/optimizer/BindItemExpr.cpp | 36 +-
core/sql/optimizer/ItemExpr.cpp | 9 +-
core/sql/optimizer/ItemFunc.h | 1 +
core/sql/optimizer/NormRelExpr.cpp | 52 +-
core/sql/optimizer/SynthType.cpp | 7 +
core/sql/regress/executor/EXPECTED015.SB | 98 +-
core/sql/regress/executor/EXPECTED131 | 67 +-
core/sql/regress/executor/TEST015 | 33 +-
core/sql/regress/executor/TEST131 | 5 +
core/sql/regress/hive/EXPECTED005 | 26 +
core/sql/regress/hive/TEST005 | 7 +
core/sql/regress/hive/TEST005_a.hive.sql | 9 +
core/sql/regress/hive/tbl_gbk.data | Bin 0 -> 129 bytes
core/sql/sqlcomp/DefaultConstants.h | 3 +
core/sql/sqlcomp/nadefaults.cpp | 2 +
core/sql/sqlmxevents/logmxevent_sq.cpp | 2 +-
.../org/trafodion/sql/CoprocessorUtils.java | 104 +
.../java/org/trafodion/sql/HBaseClient.java | 19 +-
.../src/asciidoc/_chapters/odbc_linux.adoc | 4 +-
.../src/asciidoc/_chapters/odbc_windows.adoc | 2 +-
.../src/asciidoc/_chapters/trafci.adoc | 8 +-
.../src/asciidoc/_chapters/commands.adoc | 44 +-
.../src/asciidoc/_chapters/interactive.adoc | 8 +-
.../src/asciidoc/_chapters/binder_msgs.adoc | 266 +-
.../src/asciidoc/_chapters/ddl_msgs.adoc | 19 +-
.../src/asciidoc/_chapters/executor_msgs.adoc | 5 +-
.../asciidoc/_chapters/file_system_errors.adoc | 10 +-
.../src/asciidoc/_chapters/optimizer_msgs.adoc | 4 +-
.../src/asciidoc/_chapters/parser_msgs.adoc | 16 +-
.../src/asciidoc/_chapters/sort_msgs.adoc | 4 +-
.../src/asciidoc/_chapters/sqlstate.adoc | 6 +-
.../src/asciidoc/_chapters/a_warnings.adoc | 2 +-
.../src/asciidoc/_chapters/compare_tables.adoc | 8 +-
.../src/asciidoc/_chapters/concepts.adoc | 6 +-
.../src/asciidoc/_chapters/install.adoc | Bin 13594 -> 13598 bytes
docs/odb_user/src/asciidoc/_chapters/load.adoc | 44 +-
.../src/asciidoc/_chapters/query_driver.adoc | 6 +-
.../src/asciidoc/_chapters/sql_interpreter.adoc | 4 +-
.../src/asciidoc/_chapters/cqds.adoc | 10 +-
.../src/asciidoc/_chapters/introduction.adoc | 8 +-
.../src/asciidoc/_chapters/olap_functions.adoc | 6 +-
.../src/asciidoc/_chapters/runtime_stats.adoc | 4 +-
.../src/asciidoc/_chapters/sql_clauses.adoc | 4 +-
.../sql_functions_and_expressions.adoc | 170 +-
.../_chapters/sql_language_elements.adoc | 54 +-
.../src/asciidoc/_chapters/sql_statements.adoc | 172 +-
.../src/asciidoc/_chapters/sql_utilities.adoc | 22 +-
docs/src/site/markdown/advocate.md | 15 -
docs/src/site/markdown/build-tools-manual.md | 197 -
docs/src/site/markdown/build.md | 80 -
docs/src/site/markdown/code-organization.md | 27 -
docs/src/site/markdown/code.md | 32 -
docs/src/site/markdown/contribute.md | 69 -
docs/src/site/markdown/contributing-redirect.md | 18 +
.../markdown/cplusplus-coding-guidelines.md | 310 --
.../src/site/markdown/create-dev-environment.md | 154 -
docs/src/site/markdown/develop.md | 253 --
docs/src/site/markdown/document.md | 143 -
docs/src/site/markdown/documentation.md | 15 +-
docs/src/site/markdown/download.md | 18 +-
docs/src/site/markdown/index.md | 22 +-
docs/src/site/markdown/install.md | 5 +-
.../src/site/markdown/manage-dev-environment.md | 51 -
docs/src/site/markdown/merge.md | 140 -
docs/src/site/markdown/release.md | 225 -
.../site/markdown/setup-build-environment.md | 160 -
docs/src/site/markdown/team-redirect.md | 18 +
docs/src/site/markdown/testing.md | 179 -
docs/src/site/markdown/tests.md | 71 -
docs/src/site/markdown/website.md | 108 -
docs/src/site/markdown/wiki.md | 23 -
docs/src/site/site.xml | 93 +-
install/installer/cloud_cli_setup | 20 +-
install/installer/dcs_installer | 31 +-
install/installer/rest_installer | 10 +-
.../tools/traf_cloudera_uninstall_suse | 5 +
install/installer/traf_add_sudoAccess | 11 +-
install/installer/traf_add_user | 37 +-
install/installer/traf_cloudera_mods98 | 104 +-
install/installer/traf_config | 92 +-
install/installer/traf_config_check | 202 +-
install/installer/traf_config_setup | 65 +-
install/installer/traf_create_systemdefaults | 203 -
install/installer/traf_getHadoopNodes | 13 +-
install/installer/traf_hortonworks_mods98 | 130 +-
install/installer/traf_package_setup | 29 +-
install/installer/traf_setup | 41 +-
install/installer/traf_sqgen | 98 +
install/installer/traf_start | 11 +-
install/installer/traf_user_prompt | 28 +
install/installer/traf_user_prompt_check | 27 +
install/installer/trafodion_config_default | 7 +-
install/installer/trafodion_install | 125 +-
install/installer/trafodion_uninstaller | 15 +-
install/traf_tools_setup.sh | 221 +-
wms/bin/local-servers.sh | 4 +-
wms/bin/servers.sh | 4 +-
wms/bin/start-wms.sh | 6 +-
wms/bin/stop-wms.sh | 8 +-
wms/bin/wms | 7 +-
wms/bin/wms-config.sh | 7 +-
wms/bin/wms-daemon.sh | 7 +-
wms/bin/wms-daemons.sh | 7 +-
wms/bin/zookeepers.sh | 7 +-
wms/conf/wms-env.sh | 31 +-
.../trafodion/wms/rest/ServerListResource.java | 2 +-
.../org/trafodion/wms/server/ServerManager.java | 1 -
wms/src/saveVersion.sh | 2 +-
144 files changed, 2674 insertions(+), 12958 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e612ede7/core/sql/exp/exp_clause_derived.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e612ede7/core/sql/exp/exp_conv.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e612ede7/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
diff --cc core/sql/sqlcomp/DefaultConstants.h
index 258af87,ed10f3e..d4acd8d
--- a/core/sql/sqlcomp/DefaultConstants.h
+++ b/core/sql/sqlcomp/DefaultConstants.h
@@@ -3788,11 -3788,9 +3788,14 @@@ enum DefaultConstant
// set to ON to aggressively allocate ESP per core
AGGRESSIVE_ESP_ALLOCATION_PER_CORE,
+ // if ON, use older datetime value constructor in DatetimeValue::DatetimeValue
+ // Default is OFF. This cqd is used in case there are problems.
+ // It will be removed after testing is complete.
+ USE_OLD_DT_CONSTRUCTOR,
+
+ // real charset in the HIVE table
+ HIVE_FILE_CHARSET,
+
// 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/e612ede7/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------