trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sand...@apache.org
Subject [2/7] incubator-trafodion git commit: Merge remote branch 'origin/master' into lobglobals_fix
Date Thu, 07 Jul 2016 20:36:45 GMT
Merge remote branch 'origin/master' into lobglobals_fix

Conflicts:
	core/sql/cli/Context.cpp
	core/sql/exp/ExpLOBaccess.cpp


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

Branch: refs/heads/master
Commit: 5ecd3c60282ffdc114ac4885eab10cf04680482d
Parents: 7975a58 5f77bd2
Author: Sandhya Sundaresan <sandhya@apache.org>
Authored: Fri Jul 1 22:02:58 2016 +0000
Committer: Sandhya Sundaresan <sandhya@apache.org>
Committed: Fri Jul 1 22:02:58 2016 +0000

----------------------------------------------------------------------
 .rat-excludes                                   |    2 +-
 RAT_README                                      |   16 +-
 README                                          |    4 +-
 .../main/java/org/trafodion/jdbc/t4/Bytes.java  |    5 +
 .../trafodion/jdbc/t4/InterfaceResultSet.java   |   29 +-
 .../trafodion/jdbc/t4/InterfaceStatement.java   |   25 +
 .../trafodion/jdbc/t4/InterfaceUtilities.java   |   11 +-
 .../java/org/trafodion/jdbc/t4/TrafT4Desc.java  |    4 +-
 .../jdbc/t4/TrafT4PreparedStatement.java        |    2 +-
 .../java/org/trafodion/jdbc/t4/Utility.java     |   12 +-
 core/conn/jdbc_type2/Makefile                   |    2 +-
 core/conn/jdbc_type2/native/SQLMXDriver.cpp     |   38 +-
 .../odbc/src/odbc/nsksrvrcore/sqlinterface.cpp  |   96 +-
 .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp    |  137 ++
 .../odbc/odbcclient/unixcli/makefile.lnx        |    2 +-
 core/dbsecurity/auth/src/ldapcheck.cpp          |    2 +
 core/sqf/sqenvcom.sh                            |    1 -
 core/sqf/sql/scripts/krb5check                  |  133 ++
 core/sqf/sql/scripts/krb5functions              |  128 ++
 core/sqf/sql/scripts/krb5service                |  255 +++
 core/sqf/sql/scripts/sqcheck                    |   68 +-
 core/sqf/sql/scripts/sqstart                    |   37 +
 core/sqf/src/seabed/test/t284.h                 |   52 +-
 core/sqf/src/seabed/test/t284cli.cpp            |    5 +
 core/sqf/src/seabed/test/t284cli.java           |   75 +-
 core/sqf/src/seabed/test/t284clicom.h           |   58 +
 core/sqf/src/seabed/test/t284lib.cpp            |   79 +
 core/sqf/src/seabed/test/t284srv.cpp            |  250 +++
 .../transactional/TrxRegionEndpoint.java.tmpl   |   40 +-
 .../hbase/regionserver/transactional/IdTm.java  |   82 +-
 core/sqf/src/seatrans/tm/hbasetmlib2/idtm.cpp   |   85 +-
 .../src/seatrans/tm/hbasetmlib2/idtmclicom.h    |   70 +-
 core/sqf/src/seatrans/tm/hbasetmlib2/idtmjni.h  |   14 +
 .../trafodion/dtm/HBaseAuditControlPoint.java   |    4 +-
 .../java/org/trafodion/dtm/TmAuditTlog.java     |  101 +-
 core/sqf/src/tm/idtmsrv.cpp                     |  350 +++-
 core/sqf/src/tm/idtmsrv.h                       |   52 +-
 core/sql/arkcmp/CmpStatement.cpp                |   42 +-
 core/sql/bin/SqlciErrors.txt                    |   13 +-
 core/sql/cli/Cli.cpp                            |    1 +
 core/sql/cli/CliExpExchange.cpp                 |   29 +-
 core/sql/cli/CliExtern.cpp                      |    1 -
 core/sql/cli/Context.cpp                        |   92 +-
 core/sql/cli/Context.h                          |    1 +
 core/sql/cli/Descriptor.cpp                     |   16 +-
 core/sql/cli/ExSqlComp.cpp                      |   17 +-
 core/sql/cli/SessionDefaults.cpp                |    3 +-
 core/sql/cli/SessionDefaults.h                  |   13 +-
 core/sql/cli/sqlcli.h                           |    7 +
 core/sql/comexe/ComTdb.cpp                      |   59 +-
 core/sql/comexe/ComTdb.h                        |   28 +-
 core/sql/comexe/ComTdbExeUtil.cpp               |  137 +-
 core/sql/comexe/ComTdbExeUtil.h                 |  123 +-
 core/sql/comexe/ComTdbFastTransport.cpp         |    3 +
 core/sql/comexe/ComTdbFastTransport.h           |    8 +-
 core/sql/common/BaseTypes.cpp                   |   85 +-
 core/sql/common/BigNumHelper.cpp                |   27 +-
 core/sql/common/BigNumHelper.h                  |    6 +-
 core/sql/common/CharType.cpp                    |    6 +-
 core/sql/common/CharType.h                      |   10 +-
 core/sql/common/ComSmallDefs.h                  |   16 +-
 core/sql/common/ComSysUtils.h                   |   21 +
 core/sql/common/Int64.cpp                       |   20 +
 core/sql/common/Int64.h                         |   12 +
 core/sql/common/NAType.cpp                      |   93 +-
 core/sql/common/NAType.h                        |    7 +
 core/sql/common/NumericType.cpp                 |  319 +++-
 core/sql/common/NumericType.h                   |  226 +--
 core/sql/common/OperTypeEnum.h                  |    1 +
 core/sql/common/SQLTypeDefs.h                   |    6 +
 core/sql/common/dfs2rec.h                       |    9 +-
 core/sql/executor/ExComTdb.cpp                  |    9 +-
 core/sql/executor/ExExeUtil.h                   |   61 +-
 core/sql/executor/ExExeUtilGet.cpp              |   73 +-
 core/sql/executor/ExExeUtilMisc.cpp             |  102 +-
 core/sql/executor/ExFastTransport.cpp           |   22 +-
 core/sql/executor/ExHbaseAccess.cpp             |   26 +
 core/sql/executor/ExHbaseIUD.cpp                |    6 +-
 core/sql/executor/ExHdfsScan.cpp                |    4 +-
 core/sql/exp/ExpAlignedFormat.h                 |   10 +-
 core/sql/exp/ExpErrorEnums.h                    |    4 +-
 core/sql/exp/ExpHbaseInterface.h                |   16 -
 core/sql/exp/ExpLOBaccess.cpp                   |   80 +-
 core/sql/exp/ExpLOBaccess.h                     |    3 +-
 core/sql/exp/ExpPCodeClauseGen.cpp              |    2 -
 core/sql/exp/ExpPCodeOptsConstProp.cpp          |    2 +-
 core/sql/exp/exp_arith.cpp                      |   99 +-
 core/sql/exp/exp_attrs.cpp                      |    5 +-
 core/sql/exp/exp_bignum.cpp                     |   12 +-
 core/sql/exp/exp_clause_derived.h               |   53 +-
 core/sql/exp/exp_comp.cpp                       |  170 +-
 core/sql/exp/exp_conv.cpp                       | 1597 ++++++++++++++----
 core/sql/exp/exp_fixup.cpp                      |   82 +-
 core/sql/exp/exp_function.cpp                   |  178 +-
 core/sql/exp/exp_math_func.cpp                  |  107 +-
 core/sql/exp/exp_tuple_desc.h                   |    2 +-
 core/sql/generator/GenFastTransport.cpp         |   74 +-
 core/sql/generator/GenPreCode.cpp               |  296 ++--
 core/sql/generator/GenRelExeUtil.cpp            |  112 +-
 core/sql/generator/GenRelScan.cpp               |   59 +-
 core/sql/generator/Generator.cpp                |    6 +-
 core/sql/langman/LmJavaType.cpp                 |   21 +-
 core/sql/langman/LmJavaType.h                   |    1 +
 core/sql/langman/LmResultSetJava.cpp            |   56 +-
 core/sql/langman/LmRoutineCSql.cpp              |   27 +
 core/sql/nskgmake/openssl_client/Makefile       |   80 -
 core/sql/optimizer/BindRelExpr.cpp              |  313 ++--
 core/sql/optimizer/BindWA.cpp                   |    3 +-
 core/sql/optimizer/BindWA.h                     |   38 +-
 core/sql/optimizer/EncodedValue.cpp             |   16 +-
 core/sql/optimizer/ItemExpr.cpp                 |   33 +-
 core/sql/optimizer/ItemFunc.h                   |   64 +-
 core/sql/optimizer/NAColumn.cpp                 |   82 +-
 core/sql/optimizer/NAColumn.h                   |    3 +
 core/sql/optimizer/NAFileSet.h                  |    2 +
 core/sql/optimizer/NATable.cpp                  |  267 ++-
 core/sql/optimizer/NATable.h                    |   25 +-
 core/sql/optimizer/NormRelExpr.cpp              |    4 +-
 core/sql/optimizer/OptPhysRelExpr.cpp           |   31 +-
 core/sql/optimizer/OptRange.cpp                 |    2 -
 core/sql/optimizer/RelExeUtil.cpp               |  179 +-
 core/sql/optimizer/RelExeUtil.h                 |   94 +-
 core/sql/optimizer/RelExpr.cpp                  |    2 +-
 core/sql/optimizer/RelUpdate.h                  |    5 +
 core/sql/optimizer/ScanOptimizer.cpp            |    6 +
 core/sql/optimizer/SynthType.cpp                |   11 +-
 core/sql/optimizer/ValueDesc.cpp                |   91 +-
 core/sql/parser/ElemDDLLike.cpp                 |    4 +-
 core/sql/parser/ElemDDLLikeCreateTable.h        |    6 +-
 core/sql/parser/ElemDDLLikeOptions.cpp          |   25 +
 core/sql/parser/ElemDDLLikeOptions.h            |   34 +
 core/sql/parser/ElemDDLNode.cpp                 |   32 +
 core/sql/parser/ElemDDLNode.h                   |    2 +
 core/sql/parser/ElemDDLSaltOptions.h            |    2 +
 core/sql/parser/ParDDLLikeOpts.cpp              |   45 +
 core/sql/parser/ParDDLLikeOptsCreateTable.h     |    8 +
 core/sql/parser/ParKeyWords.cpp                 |    3 -
 core/sql/parser/SqlParserAux.cpp                |   20 +-
 core/sql/parser/StmtDDLAlterLibrary.h           |   14 +
 core/sql/parser/StmtDDLCreate.cpp               |   44 +-
 core/sql/parser/sqlparser.y                     |  182 +-
 core/sql/regress/charsets/EXPECTED315           |    4 +-
 core/sql/regress/compGeneral/EXPECTED015.SB     |  469 ++---
 core/sql/regress/compGeneral/EXPECTED042        |   32 +-
 core/sql/regress/core/EXPECTED116               |  125 +-
 core/sql/regress/core/TEST116                   |   37 +-
 core/sql/regress/executor/EXPECTED022.SB        |  246 ++-
 core/sql/regress/executor/EXPECTED063           |  166 +-
 core/sql/regress/executor/EXPECTED140           |   60 +-
 core/sql/regress/executor/TEST022               |   54 +-
 core/sql/regress/hive/EXPECTED003               |   28 +-
 core/sql/regress/hive/EXPECTED005               |  301 +++-
 core/sql/regress/hive/EXPECTED009               | 1139 +++++++++++--
 core/sql/regress/hive/EXPECTED018               |  184 +-
 core/sql/regress/hive/FILTER009                 |   49 +
 core/sql/regress/hive/TEST005                   |  103 +-
 core/sql/regress/hive/TEST005_a.hive.sql        |   15 +-
 core/sql/regress/hive/TEST009                   |   93 +-
 core/sql/regress/hive/TEST020                   |    2 +-
 core/sql/regress/hive/tbl_bad.data              |    2 +-
 core/sql/regress/hive/tbl_type.data             |    2 +-
 core/sql/regress/privs1/EXPECTED133             |  Bin 26383 -> 26390 bytes
 core/sql/regress/privs1/TEST133                 |    2 +-
 core/sql/regress/privs2/EXPECTED129             |   36 +-
 core/sql/regress/qat/eqatdml12                  |   98 +-
 core/sql/regress/qat/eqatdml13                  |   98 +-
 core/sql/regress/seabase/EXPECTED003            | 1414 ++++++++++++++++
 core/sql/regress/seabase/EXPECTED011            |   16 +-
 core/sql/regress/seabase/EXPECTED020            |    8 +-
 core/sql/regress/seabase/EXPECTED031            |  237 +++
 core/sql/regress/seabase/EXPECTED040            |  275 +++
 core/sql/regress/seabase/TEST003                |  237 +++
 core/sql/regress/seabase/TEST011                |    2 +-
 core/sql/regress/seabase/TEST031                |   53 +
 core/sql/regress/seabase/TEST040                |  115 ++
 core/sql/regress/tools/runallsb                 |    2 +-
 core/sql/regress/udr/EXPECTED001                |   22 +-
 core/sql/regress/udr/EXPECTED100.SB             |   53 +-
 core/sql/regress/udr/TEST001                    |    5 +
 core/sql/regress/udr/TEST100                    |   13 +
 core/sql/regress/udr/t100.java                  |    4 +
 core/sql/sqlcat/desc.h                          |    3 +-
 core/sql/sqlci/Formatter.cpp                    |   19 +-
 core/sql/sqlci/Param.cpp                        |    5 +-
 core/sql/sqlci/SqlciEnv.cpp                     |   29 +-
 core/sql/sqlci/SqlciEnv.h                       |    2 +-
 core/sql/sqlci/sqlci_lex.ll                     |    1 +
 core/sql/sqlci/sqlci_yacc.y                     |    2 +
 core/sql/sqlcomp/CmpDDLCatErrorCodes.h          |    2 +-
 core/sql/sqlcomp/CmpDescribe.cpp                |  300 +++-
 core/sql/sqlcomp/CmpSeabaseDDL.h                |  139 +-
 core/sql/sqlcomp/CmpSeabaseDDLauth.cpp          |  108 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |  233 ++-
 core/sql/sqlcomp/CmpSeabaseDDLindex.cpp         |   89 +-
 core/sql/sqlcomp/CmpSeabaseDDLmd.h              |    8 +
 core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp       |  137 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |  174 +-
 core/sql/sqlcomp/DefaultConstants.h             |   57 +-
 core/sql/sqlcomp/DefaultValidator.cpp           |   15 +
 core/sql/sqlcomp/NADefaults.h                   |   10 +-
 core/sql/sqlcomp/QCache.cpp                     |    4 +-
 core/sql/sqlcomp/nadefaults.cpp                 |  236 ++-
 core/sql/sqludr/sqludr.cpp                      |    6 +
 .../java/org/trafodion/sql/HBaseClient.java     |   17 +
 .../java/org/trafodion/sql/HBulkLoadClient.java |    3 +-
 .../java/org/trafodion/sql/udr/ColumnInfo.java  |    6 +
 core/sql/ustat/hs_cli.cpp                       |   51 +-
 core/sql/ustat/hs_faststats.cpp                 |   15 +-
 core/sql/ustat/hs_globals.cpp                   |  266 +--
 core/sql/ustat/hs_la.cpp                        |   25 +-
 core/sql/ustat/hs_la.h                          |   23 +-
 .../src/asciidoc/_chapters/parser_msgs.adoc     |   13 +
 .../src/asciidoc/_chapters/sqlstate.adoc        |    1 +
 .../src/asciidoc/_chapters/about.adoc           |    6 +-
 .../src/asciidoc/_chapters/activate.adoc        |    1 +
 .../src/asciidoc/_chapters/enable_security.adoc |  251 +--
 .../src/asciidoc/_chapters/introduction.adoc    |  142 +-
 .../src/asciidoc/_chapters/prepare.adoc         |   41 +-
 .../src/asciidoc/_chapters/requirements.adoc    |   34 +-
 .../src/asciidoc/_chapters/script_install.adoc  |   13 +-
 .../src/asciidoc/_chapters/script_upgrade.adoc  |   14 +-
 docs/shared/revisions.txt                       |    3 +-
 .../src/asciidoc/_chapters/sql_statements.adoc  |   51 +-
 docs/src/site/markdown/documentation.md         |   10 +-
 docs/src/site/markdown/download.md              |  161 +-
 docs/src/site/markdown/release-notes-2-0-0.md   |  152 ++
 docs/src/site/markdown/release-notes-2-0-1.md   |   40 +
 docs/src/site/markdown/release-notes.md         |    4 +-
 install/installer/traf_add_kerberos             |  204 +++
 install/installer/traf_add_ldap                 |   98 ++
 install/installer/traf_cloudera_mods            |   16 +
 install/installer/traf_config_check             |    2 +-
 install/installer/traf_config_setup             |  159 --
 install/installer/traf_hortonworks_mods         |   32 +-
 install/installer/traf_secure                   |   60 +
 install/installer/traf_secure_setup             |  342 ++++
 install/installer/traf_sqgen                    |   37 +-
 install/installer/trafodion_config_default      |   36 +-
 install/installer/trafodion_install             |   96 +-
 install/installer/trafodion_secure_install      |  129 ++
 install/installer/trafodion_uninstaller         |   20 +
 licenses/lic-clients-bin                        |  136 +-
 licenses/lic-server-bin                         |  560 +-----
 licenses/lic-server-src                         |    3 +
 win-odbc64/odbcclient/drvr35/cconnect.cpp       |    9 +-
 245 files changed, 14431 insertions(+), 5163 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5ecd3c60/core/sql/cli/Cli.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5ecd3c60/core/sql/cli/CliExtern.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5ecd3c60/core/sql/cli/Context.cpp
----------------------------------------------------------------------
diff --cc core/sql/cli/Context.cpp
index 5dfb6b5,207f51f..3881fde
--- a/core/sql/cli/Context.cpp
+++ b/core/sql/cli/Context.cpp
@@@ -59,7 -59,8 +59,10 @@@
  #include "exp_clause_derived.h"
  #include "ComUser.h"
  #include "CmpSeabaseDDLauth.h"
++
 +#include "hdfs.h"
+ #include "StmtCompilationMode.h"
+ 
  #include "ExCextdecs.h"
  
  #include "ComMemoryDiags.h"             // ComMemoryDiags::DumpMemoryInfo()

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5ecd3c60/core/sql/cli/Context.h
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5ecd3c60/core/sql/executor/ExExeUtil.h
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5ecd3c60/core/sql/executor/ExExeUtilGet.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5ecd3c60/core/sql/executor/ExExeUtilMisc.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5ecd3c60/core/sql/executor/ExFastTransport.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5ecd3c60/core/sql/executor/ExHbaseIUD.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5ecd3c60/core/sql/executor/ExHdfsScan.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5ecd3c60/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------
diff --cc core/sql/exp/ExpLOBaccess.cpp
index 2c69703,9446327..b3b7f23
--- a/core/sql/exp/ExpLOBaccess.cpp
+++ b/core/sql/exp/ExpLOBaccess.cpp
@@@ -2453,9 -2501,11 +2483,9 @@@ Ex_Lob_Error ExLobsOper 
        lobPtr->initStats(); // because file may remain open across cursors
        break;
  
--    case Lob_Empty_Directory:
-      
 -      lobPtr->initialize(fileName, EX_LOB_RW,
 -			 dir, storage, hdfsServer, hdfsPort, dir, bufferSize, 
 -                         replication, blockSize);
 -      err = lobPtr->emptyDirectory(dir, lobGlobals);
++    case Lob_Empty_Directory:    
 +      err = lobPtr->emptyDirectory();
++
        break;
  
      case Lob_Data_Mod_Check:

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5ecd3c60/core/sql/exp/ExpLOBaccess.h
----------------------------------------------------------------------
diff --cc core/sql/exp/ExpLOBaccess.h
index d873c91,176e400..c8be6a9
--- a/core/sql/exp/ExpLOBaccess.h
+++ b/core/sql/exp/ExpLOBaccess.h
@@@ -493,11 -494,11 +493,12 @@@ class ExLo
         Int64  modTS,
         Lng32  numOfPartLevels);
  
-   Ex_Lob_Error emptyDirectory();
+   Ex_Lob_Error emptyDirectory(char* dirPath, ExLobGlobals* lobGlobals);
+ 
    ExLobStats *getStats() { return &stats_; }
    NAHeap *getLobGlobalHeap() { return lobGlobalHeap_;}
 -  ExLobRequest *getRequest() { return &request_; }
 +
 +  //    ExLobRequest *getRequest() { return &request_; }
    
    //The next 2 functions are not active at this point. They serve as an example
    //on how to send requests across to the mxlobsrvr process from the master 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5ecd3c60/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5ecd3c60/core/sql/src/main/java/org/trafodion/sql/HBulkLoadClient.java
----------------------------------------------------------------------


Mime
View raw message