trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sure...@apache.org
Subject [28/50] [abbrv] incubator-trafodion git commit: Merge remote branch 'origin/master' into TRAFODION-2001
Date Wed, 31 May 2017 18:47:29 GMT
Merge remote branch 'origin/master' into TRAFODION-2001


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

Branch: refs/heads/master
Commit: 79dccc2d7ae81e6182469383a002d4a0fa54a57b
Parents: 5175653 bbbd26e
Author: Zalo Correa <zalo.correa@esgyn.com>
Authored: Sat Nov 19 13:16:24 2016 -0800
Committer: Zalo Correa <zalo.correa@esgyn.com>
Committed: Sat Nov 19 13:16:24 2016 -0800

----------------------------------------------------------------------
 .../jdbcT4/src/main/java/T4Messages.properties  |  18 +
 .../trafodion/jdbc/t4/ExtractLobMessage.java    |  59 +++
 .../org/trafodion/jdbc/t4/ExtractLobReply.java  |  58 +++
 .../java/org/trafodion/jdbc/t4/TRANSPORT.java   |   3 +
 .../java/org/trafodion/jdbc/t4/TrafT4Blob.java  | 182 +++++++
 .../java/org/trafodion/jdbc/t4/TrafT4Clob.java  | 202 ++++++++
 .../org/trafodion/jdbc/t4/TrafT4ResultSet.java  |  91 +++-
 .../jdbc/t4/odbc_SQLSvc_ExtractLob_exc_.java    |  78 +++
 core/conn/odb/src/odb.c                         |  12 +-
 core/conn/odbc/src/odbc/Common/TransportBase.h  |   1 +
 .../src/odbc/Krypton/generated_incs/odbc_sv.h   |  26 +
 .../nsksrvr/Interface/marshalingsrvr_srvr.cpp   | 102 ++++
 .../nsksrvr/Interface/marshalingsrvr_srvr.h     |  10 +-
 .../src/odbc/nsksrvr/Interface/odbcs_srvr.cpp   |  45 ++
 .../odbc/nsksrvr/Interface/odbcs_srvr_res.cpp   |  39 ++
 .../src/odbc/nsksrvr/Interface/odbcs_srvr_res.h |   9 +-
 core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp |  29 +-
 core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h   |   8 +
 .../conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h |  10 +
 .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp    | 129 +++++
 .../export/include/common/evl_sqlog_eventnum.h  |   1 +
 core/sqf/monitor/linux/cluster.cxx              |  52 +-
 core/sqf/monitor/linux/zclient.cxx              |  32 +-
 core/sqf/monitor/linux/zclient.h                |   3 +-
 .../transactional/TransactionalTable.java       |   8 +-
 .../transactional/TrxTransactionState.java.tmpl |  13 +-
 core/sqf/src/tm/tmddlrequests.cpp               |   8 +-
 core/sql/cli/Statement.cpp                      |   2 +-
 core/sql/comexe/ComTdbSort.h                    |   4 +-
 core/sql/common/OperTypeEnum.h                  |   1 +
 core/sql/executor/ExExeUtilMisc.cpp             |   6 +-
 core/sql/executor/ExFastTransport.cpp           |   6 +-
 core/sql/executor/ExHbaseIUD.cpp                |   4 +-
 core/sql/executor/ExHdfsScan.cpp                |  24 +-
 core/sql/executor/ExHdfsScan.h                  |   1 +
 core/sql/executor/ex_sort.cpp                   | 222 +++++----
 core/sql/executor/ex_sort.h                     | 130 ++++-
 core/sql/executor/ex_sort_grby.cpp              |   8 +-
 core/sql/exp/ExpLOB.cpp                         |  22 +-
 core/sql/exp/ExpLOBaccess.cpp                   |  36 +-
 core/sql/exp/ExpLOBaccess.h                     |  11 +-
 core/sql/exp/ExpLOBinterface.cpp                |   5 +-
 core/sql/exp/ExpLOBinterface.h                  |   2 +-
 core/sql/exp/ExpSqlTupp.h                       |   7 +-
 core/sql/generator/GenRelMisc.cpp               |   2 +-
 core/sql/optimizer/BindItemExpr.cpp             |   9 +
 core/sql/optimizer/BindRelExpr.cpp              | 482 ++++++++++++++++++-
 core/sql/optimizer/BindWA.cpp                   |   1 +
 core/sql/optimizer/BindWA.h                     |   5 +-
 core/sql/optimizer/HDFSHook.cpp                 |   8 +-
 core/sql/optimizer/Inlining.cpp                 |  74 ++-
 core/sql/optimizer/ItemExpr.cpp                 |   4 +-
 core/sql/optimizer/ItemFunc.h                   |   2 +
 core/sql/optimizer/NormRelExpr.cpp              |   3 +
 core/sql/optimizer/OptPhysRelExpr.cpp           |  31 +-
 core/sql/optimizer/RelCache.cpp                 |  10 +
 core/sql/optimizer/RelExpr.cpp                  |   2 +
 core/sql/optimizer/RelExpr.h                    |   6 +-
 core/sql/optimizer/RelGrby.h                    |  13 +-
 core/sql/optimizer/RelMisc.h                    |   1 +
 core/sql/optimizer/RelSequence.cpp              |  13 +-
 core/sql/optimizer/RelUpdate.h                  |   5 +-
 core/sql/parser/ParKeyWords.cpp                 |   1 +
 core/sql/parser/sqlparser.y                     |  10 +-
 core/sql/regress/executor/EXPECTED002.SB        | 109 ++++-
 core/sql/regress/executor/EXPECTED015.SB        | 108 +++++
 core/sql/regress/executor/TEST002               |  38 +-
 core/sql/regress/executor/TEST015               |  25 +
 core/sql/regress/seabase/EXPECTED033            | 129 ++---
 core/sql/regress/seabase/TEST033                |  18 +-
 core/sql/sort/SortTopN.cpp                      |   7 +-
 core/sql/sqlcomp/DefaultConstants.h             |   4 +
 core/sql/sqlcomp/nadefaults.cpp                 |   1 +
 core/sql/sqludr/sqludr.cpp                      |  22 +
 core/sql/sqludr/sqludr.h                        |   1 +
 core/sql/ustat/hs_cli.cpp                       | 361 ++++++++------
 core/sql/ustat/hs_cli.h                         |  67 ++-
 core/sql/ustat/hs_globals.cpp                   | 208 ++++----
 core/sql/ustat/hs_globals.h                     |  18 +-
 core/sql/ustat/hs_log.h                         |  15 +-
 core/sql/ustat/hs_read.cpp                      |   4 +-
 core/sql/ustat/hs_update.cpp                    |   1 +
 .../java/org/trafodion/jdbc_test/TestClob.java  |  95 ++++
 install/installer/traf_start                    |  13 +-
 84 files changed, 3046 insertions(+), 599 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/79dccc2d/core/sqf/export/include/common/evl_sqlog_eventnum.h
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/79dccc2d/core/sqf/monitor/linux/cluster.cxx
----------------------------------------------------------------------
diff --cc core/sqf/monitor/linux/cluster.cxx
index eec0536,93362a3..c07e691
--- a/core/sqf/monitor/linux/cluster.cxx
+++ b/core/sqf/monitor/linux/cluster.cxx
@@@ -4515,14 -4317,20 +4515,20 @@@ int CCluster::AllgatherSock( int nbytes
          bool p_sending;
          bool p_receiving;
          int p_timeout_count;
+         bool p_initial_check;
          char *p_buff;
+         struct timespec znodeFailedTime;
      } peer_t;
 -    peer_t p[cfgPNodes_];
 +    peer_t p[GetConfigPNodesMax()];
      memset( p, 0, sizeof(p) );
      tag = 0; // make compiler happy
+     struct timespec currentTime;
+     // Set to twice the ZClient session timeout
+     static int sessionTimeout = ZClientEnabled 
+                                 ? (ZClient->GetSessionTimeout() * 2) : 120;
  
      int nsent = 0, nrecv = 0;
 -    for ( int iPeer = 0; iPeer < cfgPNodes_; iPeer++ )
 +    for ( int iPeer = 0; iPeer < GetConfigPNodesMax(); iPeer++ )
      {
          peer_t *peer = &p[iPeer];
          stats[iPeer].MPI_ERROR = MPI_SUCCESS;
@@@ -4588,12 -4397,13 +4595,13 @@@
      }
  
      // do the work
 -    struct epoll_event events[2*cfgPNodes_ + 1];
 +    struct epoll_event events[2*GetConfigPNodesMax() + 1];
      while ( 1 )
      {
 -        int maxEvents = 2*cfgPNodes_ - nsent - nrecv;
 +        int maxEvents = 2*GetConfigPNodesMax() - nsent - nrecv;
          if ( maxEvents == 0 ) break;
          int nw;
+         int zerr = ZOK;
          while ( 1 )
          {
              nw = epoll_wait( epollFD_, events, maxEvents, sv_epoll_wait_timeout );

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/79dccc2d/core/sqf/monitor/linux/zclient.cxx
----------------------------------------------------------------------


Mime
View raw message