You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2016/05/13 07:37:47 UTC
[2/5] incubator-trafodion git commit: Merge remote branch
'origin/master' into traf2.1_misc
Merge remote branch 'origin/master' into traf2.1_misc
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/eb407a96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/eb407a96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/eb407a96
Branch: refs/heads/master
Commit: eb407a9697be15bd194ce45e3526c9b125652d1d
Parents: 3b31f50 bc1b2e1
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Tue May 10 04:32:04 2016 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Tue May 10 04:32:04 2016 +0000
----------------------------------------------------------------------
core/sql/bin/SqlciErrors.txt | 2 +
core/sql/executor/ExHdfsScan.h | 1 +
core/sql/exp/ExpPCodeClauseGen.cpp | 1 +
core/sql/exp/exp_clause.cpp | 6 +-
core/sql/exp/exp_clause_derived.h | 9 +-
core/sql/exp/exp_conv.cpp | 13 +-
core/sql/generator/GenItemFunc.cpp | 16 +-
core/sql/generator/GenRelExeUtil.cpp | 2 +-
core/sql/generator/GenRelScan.cpp | 14 +-
core/sql/optimizer/ItemExpr.cpp | 2 +
core/sql/optimizer/ItemFunc.h | 8 +
core/sql/regress/executor/EXPECTED130 | 117 +-
core/sql/regress/executor/TEST130 | 51 +-
core/sql/regress/hive/EXPECTED005 | 97 +
core/sql/regress/hive/EXPECTED015 | 101 +-
core/sql/regress/hive/TEST005 | 40 +
core/sql/regress/hive/TEST005_a.hive.sql | 16 +
core/sql/regress/hive/TEST015 | 14 +-
core/sql/regress/hive/tbl_bad.data | 8 +
core/sql/ustat/hs_const.h | 1 +
core/sql/ustat/hs_globals.cpp | 1 +
core/sql/ustat/hs_la.cpp | 13 +
core/sql/ustat/hs_parser.cpp | 5 +-
docs/client_install/pom.xml | 10 +
.../src/asciidoc/_chapters/SQuirrel.adoc | 16 +-
.../src/asciidoc/_chapters/about.adoc | 16 +-
.../src/asciidoc/_chapters/dbviz.adoc | 12 +-
.../src/asciidoc/_chapters/introduction.adoc | 104 +-
.../src/asciidoc/_chapters/jdbct4.adoc | 32 +-
.../src/asciidoc/_chapters/odb.adoc | 8 +-
.../src/asciidoc/_chapters/odbc_linux.adoc | 18 +-
.../src/asciidoc/_chapters/odbc_windows.adoc | 54 +-
.../src/asciidoc/_chapters/trafci.adoc | 10 +-
docs/client_install/src/asciidoc/index.adoc | 28 +-
docs/command_interface/pom.xml | 8 +
.../src/asciidoc/_chapters/about.adoc | 22 +-
.../src/asciidoc/_chapters/commands.adoc | 40 +-
.../src/asciidoc/_chapters/install.adoc | 4 +-
.../src/asciidoc/_chapters/interactive.adoc | 14 +-
.../src/asciidoc/_chapters/introduction.adoc | 6 +-
.../src/asciidoc/_chapters/launch.adoc | 16 +-
.../src/asciidoc/_chapters/perlpython.adoc | 6 +-
.../src/asciidoc/_chapters/scripts.adoc | 4 +-
docs/command_interface/src/asciidoc/index.adoc | 29 +-
docs/cqd_reference/pom.xml | 8 +
.../src/asciidoc/_chapters/about.adoc | 23 +-
.../src/asciidoc/_chapters/debugging.adoc | 14 +-
.../src/asciidoc/_chapters/histograms.adoc | 16 +-
.../src/asciidoc/_chapters/introduction.adoc | 8 +-
.../_chapters/operational_controls.adoc | 26 +-
.../src/asciidoc/_chapters/query_execution.adoc | 46 +-
.../src/asciidoc/_chapters/query_plans.adoc | 78 +-
.../asciidoc/_chapters/runtime_controls.adoc | 6 +-
.../src/asciidoc/_chapters/schema_controls.adoc | 8 +-
.../asciidoc/_chapters/table_definition.adoc | 28 +-
.../src/asciidoc/_chapters/transactions.adoc | 6 +-
.../src/asciidoc/_chapters/update_stats.adoc | 14 +-
docs/cqd_reference/src/asciidoc/index.adoc | 21 +-
docs/jdbct4ref_guide/pom.xml | 297 +++
.../src/asciidoc/_chapters/about.adoc | 174 ++
.../src/asciidoc/_chapters/accessing.adoc | 906 ++++++++
.../asciidoc/_chapters/avoiding_mismatch.adoc | 97 +
.../src/asciidoc/_chapters/code_examples.adoc | 56 +
.../src/asciidoc/_chapters/compliance.adoc | 367 ++++
.../src/asciidoc/_chapters/introduction.adoc | 53 +
.../src/asciidoc/_chapters/lob_data.adoc | 553 +++++
.../src/asciidoc/_chapters/lob_management.adoc | 288 +++
.../src/asciidoc/_chapters/messages.adoc | 1943 ++++++++++++++++++
.../asciidoc/_chapters/properties_detail.adoc | 959 +++++++++
.../asciidoc/_chapters/properties_overview.adoc | 244 +++
.../src/asciidoc/_chapters/tracing_logging.adoc | 176 ++
docs/jdbct4ref_guide/src/asciidoc/index.adoc | 67 +
docs/jdbct4ref_guide/src/images/lob_tables.jpg | Bin 0 -> 16241 bytes
.../src/resources/source/blob_example.java | 202 ++
.../src/resources/source/clob_example.java | 200 ++
docs/load_transform/pom.xml | 8 +
.../src/asciidoc/_chapters/about.adoc | 31 +-
.../src/asciidoc/_chapters/bulk_load.adoc | 34 +-
.../src/asciidoc/_chapters/bulk_unload.adoc | 12 +-
.../src/asciidoc/_chapters/introduction.adoc | 24 +-
.../src/asciidoc/_chapters/monitor.adoc | 8 +-
.../src/asciidoc/_chapters/tables_indexes.adoc | 24 +-
.../src/asciidoc/_chapters/trickle_load.adoc | 54 +-
.../src/asciidoc/_chapters/troubleshoot.adoc | 20 +-
docs/load_transform/src/asciidoc/index.adoc | 22 +-
docs/messages_guide/pom.xml | 8 +
.../src/asciidoc/_chapters/about.adoc | 25 +-
.../src/asciidoc/_chapters/binder_msgs.adoc | 162 +-
.../src/asciidoc/_chapters/compiler_msgs.adoc | 164 +-
.../src/asciidoc/_chapters/ddl_msgs.adoc | 156 +-
.../src/asciidoc/_chapters/executor_msgs.adoc | 82 +-
.../asciidoc/_chapters/file_system_errors.adoc | 6 +-
.../src/asciidoc/_chapters/generator_msgs.adoc | 4 +-
.../src/asciidoc/_chapters/introduction.adoc | 34 +-
.../src/asciidoc/_chapters/optimizer_msgs.adoc | 6 +-
.../src/asciidoc/_chapters/parser_msgs.adoc | 74 +-
.../src/asciidoc/_chapters/sort_msgs.adoc | 68 +-
.../src/asciidoc/_chapters/sqlstate.adoc | 78 +-
.../_chapters/udr_language_mgr_msgs.adoc | 26 +-
docs/messages_guide/src/asciidoc/index.adoc | 21 +-
docs/odb_user/pom.xml | 8 +
.../src/asciidoc/_chapters/a_warnings.adoc | 4 +-
docs/odb_user/src/asciidoc/_chapters/about.adoc | 24 +-
.../src/asciidoc/_chapters/b_develop.adoc | 2 +-
.../src/asciidoc/_chapters/compare_tables.adoc | 2 +-
.../src/asciidoc/_chapters/concepts.adoc | 23 +-
.../src/asciidoc/_chapters/install.adoc | Bin 13598 -> 13248 bytes
.../src/asciidoc/_chapters/introduction.adoc | 36 +-
docs/odb_user/src/asciidoc/_chapters/load.adoc | 42 +-
.../src/asciidoc/_chapters/query_driver.adoc | 4 +-
.../src/asciidoc/_chapters/sql_interpreter.adoc | 4 +-
docs/odb_user/src/asciidoc/index.adoc | 21 +-
docs/provisioning_guide/pom.xml | 10 +
.../src/asciidoc/_chapters/about.adoc | 35 +-
.../src/asciidoc/_chapters/activate.adoc | 30 +-
.../src/asciidoc/_chapters/enable_security.adoc | 52 +-
.../src/asciidoc/_chapters/introduction.adoc | 184 +-
.../src/asciidoc/_chapters/prepare.adoc | 84 +-
.../src/asciidoc/_chapters/requirements.adoc | 125 +-
.../src/asciidoc/_chapters/script_install.adoc | 80 +-
.../src/asciidoc/_chapters/script_remove.adoc | 22 +-
.../src/asciidoc/_chapters/script_upgrade.adoc | 82 +-
docs/provisioning_guide/src/asciidoc/index.adoc | 22 +-
docs/shared/acknowledgements.txt | 60 +
docs/shared/revisions.txt | 32 +
.../spj_guide/src/asciidoc/_chapters/about.adoc | 2 +-
.../src/asciidoc/_chapters/create_spjs.adoc | 36 +-
.../src/asciidoc/_chapters/deploy_spjs.adoc | 34 +-
.../src/asciidoc/_chapters/develop_spjs.adoc | 36 +-
.../src/asciidoc/_chapters/execute_spjs.adoc | 34 +-
.../src/asciidoc/_chapters/get_started.adoc | 36 +-
.../asciidoc/_chapters/grant_privileges.adoc | 36 +-
.../src/asciidoc/_chapters/introduction.adoc | 36 +-
.../_chapters/performance_troubleshooting.adoc | 36 +-
.../src/asciidoc/_chapters/sample_database.adoc | 36 +-
.../src/asciidoc/_chapters/sample_spjs.adoc | 42 +-
docs/spj_guide/src/asciidoc/index.adoc | 14 +-
.../src/resources/acknowledgements.txt | 38 -
.../src/resources/source/create_demo.sql | 14 +
docs/sql_reference/pom.xml | 8 +
.../src/asciidoc/_chapters/about.adoc | 48 +-
.../src/asciidoc/_chapters/introduction.adoc | 112 +-
.../src/asciidoc/_chapters/limits.adoc | 4 +-
.../src/asciidoc/_chapters/olap_functions.adoc | 19 +-
.../src/asciidoc/_chapters/reserved_words.adoc | 13 +-
.../src/asciidoc/_chapters/runtime_stats.adoc | 13 +-
.../src/asciidoc/_chapters/sql_clauses.adoc | 26 +-
.../sql_functions_and_expressions.adoc | 304 +--
.../_chapters/sql_language_elements.adoc | 160 +-
.../src/asciidoc/_chapters/sql_statements.adoc | 374 ++--
.../src/asciidoc/_chapters/sql_utilities.adoc | 84 +-
docs/sql_reference/src/asciidoc/index.adoc | 27 +-
docs/src/site/resources/css/site.css | 2 +-
153 files changed, 9216 insertions(+), 2426 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eb407a96/core/sql/regress/executor/TEST130
----------------------------------------------------------------------
diff --cc core/sql/regress/executor/TEST130
index f6b4384,48da1ed..74e0cbb
--- a/core/sql/regress/executor/TEST130
+++ b/core/sql/regress/executor/TEST130
@@@ -83,12 -74,7 +74,10 @@@ select lobtostring(c2,10) from t130lob2
select lobtostring(c2,2) from t130lob2;
select c1,lobtostring(c2,100) from t130lob2;
+--test values clause
+values((select * from tlob130lob2));
+
- obey TEST130(dml_join);
-
?section dml_join
insert into t130lob3 values (1,stringtolob('inserted row21a'),stringtolob('inserted row21b'));
insert into t130lob3 values (2,stringtolob('inserted row22a'),stringtolob('inserted row22b'));
@@@ -102,12 -88,8 +91,10 @@@ select c1, lobtostring(c2,25), lobtostr
select lobtostring(t130lob2.c2,30) from t130lob2, t130lob3 where t130lob2.c1 = t130lob3.c1;
-
+values(lobtostring(t130lob2.c2));
+values (filetolob('./myfile.txt'));
+values( stringtolob('xxxxxx'));
- obey TEST130(dml_update);
-
?section dml_update
update t130lob2 set c2=stringtolob('updated c2 in all rows');