Merge branch 'master' into GetStatement2

Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/0310bd0a
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/0310bd0a
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/0310bd0a

Branch: refs/heads/master
Commit: 0310bd0a9171aa831040d7761a0258154a863360
Parents: 00336d4 0e7d16d
Author: Liu Yu <[email protected]>
Authored: Thu Jun 21 15:56:20 2018 +0800
Committer: GitHub <[email protected]>
Committed: Thu Jun 21 15:56:20 2018 +0800

----------------------------------------------------------------------
 .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp    |  135 +-
 core/sqf/monitor/linux/cluster.cxx              |    1 +
 core/sqf/monitor/linux/pnode.cxx                |    2 +
 .../sqf/src/seatrans/tm/hbasetmlib2/testrun.cpp |    2 +-
 core/sql/arkcmp/CmpStatement.cpp                |    1 -
 core/sql/arkcmp/CmpStatement.h                  |    5 -
 core/sql/cli/Context.cpp                        |    2 +-
 core/sql/cli/Statement.cpp                      |   14 +-
 core/sql/comexe/ComTdb.cpp                      |    6 -
 core/sql/comexe/ComTdb.h                        |    1 -
 core/sql/comexe/ComTdbExeUtil.cpp               |  149 +--
 core/sql/comexe/ComTdbExeUtil.h                 |  156 +--
 core/sql/common/ComMisc.cpp                     |   47 +
 core/sql/common/ComMisc.h                       |   14 +
 core/sql/common/OperTypeEnum.h                  |    1 -
 core/sql/executor/ExComTdb.cpp                  |    6 -
 core/sql/executor/ExExeUtil.h                   |  202 +--
 core/sql/executor/ExExeUtilLoad.cpp             |   21 +-
 core/sql/executor/ExExeUtilMisc.cpp             | 1156 ++++--------------
 core/sql/executor/ex_root.cpp                   |    4 +-
 core/sql/executor/hiveHook.cpp                  |   47 +-
 core/sql/executor/sql_buffer.cpp                |    2 +-
 core/sql/executor/sql_buffer.h                  |    4 +-
 core/sql/exp/ExpErrorEnums.h                    |    2 -
 core/sql/exp/ExpSqlTupp.h                       |   14 +-
 core/sql/generator/GenExplain.cpp               |   58 +
 core/sql/generator/GenPreCode.cpp               |   16 +-
 core/sql/generator/GenRelExeUtil.cpp            |  243 ++--
 core/sql/generator/GenRelScan.cpp               |    2 +-
 core/sql/generator/GenRelUpdate.cpp             |    4 +-
 core/sql/generator/Generator.cpp                |   10 +-
 core/sql/generator/Generator.h                  |    1 +
 core/sql/optimizer/BindRelExpr.cpp              |   14 +-
 core/sql/optimizer/ImplRule.h                   |   64 -
 core/sql/optimizer/RelCache.cpp                 |    4 -
 core/sql/optimizer/RelExeUtil.cpp               |  264 ++--
 core/sql/optimizer/RelExeUtil.h                 |  183 +--
 core/sql/optimizer/RelExpr.cpp                  |    2 -
 core/sql/optimizer/RelFastTransport.cpp         |   75 +-
 core/sql/optimizer/RelUpdate.h                  |   15 -
 core/sql/parser/ElemDDLLikeOptions.cpp          |   31 -
 core/sql/parser/ElemDDLLikeOptions.h            |   33 -
 core/sql/parser/ElemDDLNode.h                   |    3 -
 core/sql/parser/ParDDLLikeOpts.cpp              |   14 -
 core/sql/parser/ParDDLLikeOptsCreateTable.h     |    1 -
 core/sql/parser/SqlParserAux.cpp                |    8 -
 core/sql/parser/SqlParserAux.h                  |    8 -
 core/sql/parser/StmtDDLCreate.cpp               |    4 +-
 core/sql/parser/StmtDDLCreateTable.h            |   20 +-
 core/sql/parser/StmtDDLonHiveObjects.h          |    2 -
 core/sql/parser/sqlparser.y                     |  341 ++----
 core/sql/regress/hive/DIFF008.KNOWN             |    2 +-
 core/sql/regress/hive/EXPECTED005               |  125 +-
 core/sql/regress/hive/EXPECTED008               |  292 ++++-
 core/sql/regress/hive/FILTER008                 |    1 +
 core/sql/regress/hive/TEST008                   |   73 +-
 core/sql/sqlcomp/CmpDescribe.cpp                |   92 --
 core/sql/sqlcomp/CmpDescribe.h                  |    8 -
 core/sql/sqlcomp/CmpSeabaseDDL.h                |    5 -
 core/sql/sqlcomp/CmpSeabaseDDLcommentOn.cpp     |    9 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   24 +
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |  307 +----
 core/sql/sqlcomp/DefaultConstants.h             |   25 +-
 core/sql/sqlcomp/nadefaults.cpp                 |    7 +-
 core/sql/sqlcomp/parser.cpp                     |   18 +-
 core/sql/sqlcomp/parser.h                       |    5 +
 .../org/trafodion/jdbc_test/TestGetColumns.java |  260 ++++
 .../src/asciidoc/_chapters/sql_statements.adoc  |  397 +++++-
 68 files changed, 2238 insertions(+), 2826 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/0310bd0a/docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc
----------------------------------------------------------------------
diff --cc docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc
index 41f7d15,9abd7a7..f954796
--- a/docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc
+++ b/docs/sql_reference/src/asciidoc/_chapters/sql_statements.adoc
@@@ -5348,11 -5332,7 +5348,11 @@@ and the schema is seabase
  +
  displays the names of all the tables in the specified schema.
  
 +* `TABLES [IN VIEW view-name]`
 ++
 +returns tables that referenced by the view _view-name_.
 +
- * `users`
+ * `USERS`
  +
  displays a list of all the registered database users.
  
@@@ -5371,19 -5351,9 +5371,19 @@@ and the schema is seabase
  +
  displays the names of all the views in the specified schema. For the 
_catalog-name_, you can specify only trafodion.
  
 +* `VIEWS [IN VIEW _view-name_]`
 ++
 +returns views that referenced by the view _view-name_.
 +
 +* `VIEWS [ON VIEW _view-name_]`
 ++
 +returns views that reference the view _view-name_.
 +
- * `views on table \[[_catalog-name_.]_schema-name_.]_table-name_`
+ * `VIEWS ON TABLE _[[catalog-name.]schema-name.]table-name_`
  +
 -displays the names of all the views that were created for the specified 
table. If you do not qualify the table name with
 +returns views that reference the table _table-name_.
 ++
 +If you do not qualify the table name with
  catalog and schema names, get uses the catalog and schema of the current 
session. For the _catalog-name_, you can specify
  only trafodion.
  

Reply via email to