trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sure...@apache.org
Subject [2/7] incubator-trafodion git commit: Merge remote branch 'origin/master' into memleak1
Date Tue, 11 Oct 2016 03:57:39 GMT
Merge remote branch 'origin/master' into memleak1

Conflicts:
	core/sql/optimizer/NormRelExpr.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/a143ba9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a143ba9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a143ba9b

Branch: refs/heads/master
Commit: a143ba9b99588e0aa328959abb02512b6adf37a2
Parents: eb3986e 8039cf1
Author: Suresh Subbiah <sureshs@apache.org>
Authored: Wed Oct 5 04:17:39 2016 +0000
Committer: Suresh Subbiah <sureshs@apache.org>
Committed: Wed Oct 5 04:17:39 2016 +0000

----------------------------------------------------------------------
 core/conn/jdbc_type2/native/SQLMXDriver.cpp     |   13 -
 core/sqf/commonLogger/CommonLogger.cpp          |    5 +-
 core/sqf/commonLogger/CommonLogger.h            |    2 +
 .../export/include/common/evl_sqlog_eventnum.h  |   41 +
 core/sqf/monitor/linux/cluster.cxx              |  249 ++-
 core/sqf/monitor/linux/cluster.h                |    1 +
 core/sqf/monitor/linux/makefile                 |   25 +-
 core/sqf/monitor/linux/monitor.cxx              |  187 +++
 core/sqf/monitor/linux/monitor.h                |    2 +
 core/sqf/monitor/linux/zclient.cxx              | 1432 ++++++++++++++++++
 core/sqf/monitor/linux/zclient.h                |  116 ++
 core/sqf/monitor/linux/zootest.cxx              |  283 ++++
 core/sqf/monitor/linux/zootest.h                |   34 +
 core/sqf/sqenvcom.sh                            |   19 +-
 .../transactional/TransactionManager.java       |   11 +-
 .../client/transactional/TransactionState.java  |   41 +-
 .../transactional/SsccRegionEndpoint.java.tmpl  |    9 +-
 .../transactional/TrxRegionEndpoint.java.tmpl   |   14 +-
 .../transactional/TrxRegionObserver.java.tmpl   |    2 +-
 .../java/org/trafodion/dtm/HBaseTxClient.java   |   49 +-
 .../java/org/trafodion/dtm/TmAuditTlog.java     |   11 +-
 core/sql/bin/SqlciErrors.txt                    |    5 +-
 core/sql/cli/CliExtern.cpp                      |   15 +-
 core/sql/cli/ExSqlComp.cpp                      |    2 +-
 core/sql/comexe/ComTdbSortGrby.cpp              |    3 +-
 core/sql/comexe/ComTdbSortGrby.h                |   23 +-
 core/sql/common/Ipc.cpp                         |   22 +-
 core/sql/common/Ipc.h                           |    2 +-
 core/sql/executor/ex_frag_rt.cpp                |   30 +-
 core/sql/executor/ex_globals.h                  |   14 +
 core/sql/executor/ex_sort_grby.cpp              | 1041 +++++++++++--
 core/sql/executor/ex_sort_grby.h                |  120 +-
 core/sql/exp/ExpPCodeClauseGen.cpp              |    8 +
 core/sql/exp/exp_clause.cpp                     |   21 +-
 core/sql/exp/exp_clause_derived.h               |    8 +-
 core/sql/exp/exp_comp.cpp                       |  108 +-
 core/sql/generator/GenExpGenerator.cpp          |    1 -
 core/sql/generator/GenExplain.cpp               |   14 +-
 core/sql/generator/GenItemExpr.cpp              |    4 +
 core/sql/generator/GenItemFunc.cpp              |    2 +
 core/sql/generator/GenPreCode.cpp               |   10 +-
 core/sql/generator/GenRelGrby.cpp               |   85 +-
 core/sql/generator/GenRelUpdate.cpp             |  150 +-
 core/sql/optimizer/BindRelExpr.cpp              |   94 +-
 core/sql/optimizer/ImplRule.cpp                 |    8 +
 core/sql/optimizer/ItemExpr.cpp                 |   17 +-
 core/sql/optimizer/ItemExpr.h                   |   10 +-
 core/sql/optimizer/ItemFunc.h                   |   11 +-
 core/sql/optimizer/ItemLog.h                    |   22 +-
 core/sql/optimizer/NormItemExpr.cpp             |    8 +-
 core/sql/optimizer/NormRelExpr.cpp              |   58 +-
 core/sql/optimizer/OptPhysRelExpr.cpp           |   16 +-
 core/sql/optimizer/RelCache.cpp                 |   12 +
 core/sql/optimizer/RelExpr.cpp                  |   18 +-
 core/sql/optimizer/RelGrby.h                    |   39 +-
 core/sql/optimizer/RelJoin.h                    |    2 +-
 core/sql/optimizer/RelMisc.h                    |    1 +
 core/sql/optimizer/SynthType.cpp                |   14 +-
 core/sql/optimizer/TransRule.cpp                |   12 +-
 core/sql/parser/SqlParserAux.cpp                |   11 +-
 core/sql/parser/sqlparser.y                     |   13 +-
 core/sql/qmscommon/QRLogger.cpp                 |    8 +-
 core/sql/regress/compGeneral/EXPECTED011.SB     |   22 +-
 core/sql/regress/compGeneral/EXPECTED023        |    2 +-
 core/sql/regress/executor/TEST106               |    4 +
 core/sql/regress/hive/EXPECTED018               |  182 +--
 core/sql/regress/privs1/EXPECTED132             |  100 +-
 core/sql/regress/privs1/EXPECTED136             |    2 +
 core/sql/regress/privs2/EXPECTED129             |   23 +-
 core/sql/regress/privs2/EXPECTED135             |   17 +-
 core/sql/regress/privs2/EXPECTED138             |   22 +
 core/sql/regress/privs2/EXPECTED139             |   10 +
 core/sql/regress/privs2/EXPECTED140             |    4 +-
 core/sql/regress/privs2/EXPECTED142             |    6 +
 core/sql/regress/seabase/EXPECTED020            |   23 +
 core/sql/regress/seabase/EXPECTED033            |  617 ++++++++
 core/sql/regress/seabase/TEST020                |   10 +
 core/sql/regress/seabase/TEST033                |  162 ++
 core/sql/sqlcomp/PrivMgrDesc.cpp                |   36 +-
 core/sql/sqlcomp/PrivMgrDesc.h                  |   22 +-
 core/sql/sqlcomp/PrivMgrPrivileges.cpp          | 1349 +++++++----------
 core/sql/sqlcomp/PrivMgrPrivileges.h            |   78 +-
 core/sql/sqlcomp/nadefaults.cpp                 |    2 +-
 core/sql/sqlmxevents/logmxevent_traf.cpp        |    8 +-
 core/sql/ustat/hs_globals.cpp                   |    2 +-
 docs/src/site/markdown/index.md                 |   21 +-
 .../site/resources/images/carousel/meetup.png   |  Bin 81640 -> 0 bytes
 docs/src/site/site.xml                          |    2 +-
 install/installer/traf_cloudera_mods            |   11 +-
 .../phoenix/end2end/MultiCfQueryExecTest.java   |    5 +-
 .../end2end/SaltedTableUpsertSelectTest.java    |   13 +-
 91 files changed, 5708 insertions(+), 1655 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a143ba9b/core/sql/common/Ipc.h
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a143ba9b/core/sql/optimizer/BindRelExpr.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a143ba9b/core/sql/optimizer/NormRelExpr.cpp
----------------------------------------------------------------------
diff --cc core/sql/optimizer/NormRelExpr.cpp
index ad90c09,aba6a09..997cff8
--- a/core/sql/optimizer/NormRelExpr.cpp
+++ b/core/sql/optimizer/NormRelExpr.cpp
@@@ -1142,6 -1142,12 +1142,10 @@@ NABoolean RelExpr::getMoreOutputsIfPoss
        maxOutputs,
        outputsNeeded);
        child(i)->getGroupAttr()->addCharacteristicOutputs(outputsToAdd);
+       if (getOperatorType() == REL_MAP_VALUEIDS) 
+       {
+ 	((MapValueIds *)this)->addSameMapEntries(outputsToAdd);
+       }
 -
 -
       // child(i).getGroupAttr()->computeCharacteristicIO
  //	                                            (emptySet,  // no additional inputs
    //                                                   outputsNeeded);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a143ba9b/core/sql/optimizer/RelExpr.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a143ba9b/core/sql/optimizer/TransRule.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a143ba9b/core/sql/sqlcomp/PrivMgrDesc.h
----------------------------------------------------------------------


Mime
View raw message