trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arvi...@apache.org
Subject [3/4] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into wrkbrnch
Date Thu, 10 Mar 2016 18:29:15 GMT
Merge branch 'master' of github.com:apache/incubator-trafodion into wrkbrnch

Conflicts:
	dcs/pom.xml


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

Branch: refs/heads/master
Commit: 9291936e64aa51bc3942184c95296026128d187a
Parents: 7fe6dd1 5a6549b
Author: Anuradha Hegde <anuradha.hegde@esgyn.com>
Authored: Thu Mar 10 16:14:12 2016 +0000
Committer: Anuradha Hegde <anuradha.hegde@esgyn.com>
Committed: Thu Mar 10 16:14:12 2016 +0000

----------------------------------------------------------------------
 core/rest/pom.xml                               |    2 +-
 core/sqf/Makefile                               |    2 +-
 .../sqf/conf/log4cxx.trafodion.masterexe.config |    1 +
 core/sqf/hbase_utilities/pom.xml                |    2 +-
 core/sqf/monitor/linux/shell.cxx                |   12 +
 core/sqf/sqenvcom.sh                            |    5 +
 core/sqf/sql/scripts/gensq.pl                   |   54 +-
 core/sqf/sql/scripts/genstats.sh                |   43 +
 core/sqf/sql/scripts/get_libhdfs_files          |  203 +-
 core/sqf/sql/scripts/sqnodeipcrm                |    2 +-
 core/sqf/sql/scripts/sqstart                    |    3 +-
 core/sqf/sql/scripts/sqstop                     |    2 +-
 core/sql/SqlCompilerDebugger/mk.sh              |    5 +
 core/sql/cli/Cli.cpp                            |  442 ++-
 core/sql/cli/Cli.h                              |   15 +-
 core/sql/cli/CliExpExchange.cpp                 |   18 +-
 core/sql/cli/CliExtern.cpp                      |   54 +-
 core/sql/cli/Descriptor.cpp                     |    6 +-
 core/sql/comexe/ComTdbHbaseAccess.cpp           |    2 +-
 core/sql/comexe/ComTdbHbaseAccess.h             |    2 +-
 core/sql/common/CharType.cpp                    |    3 +-
 core/sql/common/CharType.h                      |    2 +-
 core/sql/executor/ExExeUtilLoad.cpp             |    3 +-
 core/sql/executor/ExHbaseAccess.h               |    3 +
 core/sql/executor/ExHbaseIUD.cpp                |   27 +-
 core/sql/executor/hiveHook.cpp                  |    2 +-
 core/sql/exp/ExpLOB.cpp                         |  142 +-
 core/sql/exp/ExpLOB.h                           |   41 +-
 core/sql/exp/ExpLOBaccess.cpp                   | 2905 +++++++++---------
 core/sql/exp/ExpLOBaccess.h                     |  288 +-
 core/sql/exp/ExpLOBenums.h                      |    5 +-
 core/sql/exp/ExpLOBexternal.h                   |   20 +-
 core/sql/exp/ExpLOBinterface.cpp                |  291 +-
 core/sql/exp/ExpLOBinterface.h                  |   24 +-
 core/sql/exp/ExpLOBprocess.cpp                  |  494 +--
 core/sql/exp/ExpLOBprocess.h                    |    2 +-
 core/sql/generator/GenExpGenerator.cpp          |    3 +-
 core/sql/generator/GenItemFunc.cpp              |   17 +-
 core/sql/generator/GenPreCode.cpp               |   31 +-
 core/sql/generator/GenRelUpdate.cpp             |   47 +-
 core/sql/nskgmake/Makerules.linux               |    8 +-
 core/sql/nskgmake/SqlCompilerDebugger/Makefile  |    5 +-
 core/sql/optimizer/BindRI.cpp                   |   45 +-
 core/sql/optimizer/ItemFunc.h                   |   17 +-
 core/sql/optimizer/NATable.cpp                  |    5 +-
 core/sql/optimizer/ValueDesc.cpp                |    5 +-
 core/sql/optimizer/ValueDesc.h                  |    6 +-
 core/sql/regress/compGeneral/EXPECTED013.SB     |   48 +
 core/sql/regress/compGeneral/TEST013            |   28 +
 core/sql/regress/core/EXPECTED056.SB            |    6 -
 core/sql/regress/core/TEST029                   |    1 -
 core/sql/regress/core/TEST056                   |    2 -
 core/sql/regress/executor/EXPECTED130           |  106 +-
 core/sql/regress/executor/TEST130               |   32 +
 core/sql/regress/tools/dll-compile.ksh          |    4 +-
 core/sql/regress/tools/runregr_udr.ksh          |   65 +-
 core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp       |    7 +-
 core/sql/sqlcomp/CmpSeabaseDDLindex.cpp         |    2 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |   25 +-
 core/sql/sqlcomp/DefaultConstants.h             |    1 +
 core/sql/sqlcomp/nadefaults.cpp                 |   12 +-
 core/sql/ustat/hs_cli.cpp                       |   22 +-
 core/sql/ustat/hs_globals.cpp                   |    2 +-
 dcs/pom.xml                                     |    2 +-
 install/installer/dcs_installer                 |    8 +-
 install/installer/parseHBaseSite.py             |   55 +
 install/installer/traf_add_sudoAccess           |    5 +-
 install/installer/traf_config_check             |    8 +-
 install/installer/traf_hortonworks_mods98       |   26 -
 install/installer/traf_sqgen                    |    2 +-
 install/installer/trafodion_install             |   17 +-
 install/traf_tools_setup.sh                     |   56 +-
 licenses/lic-clients-bin                        |   33 +-
 licenses/lic-winodbc-bin                        |   50 +
 tools/docker/Dockerfile                         |   45 +
 tools/docker/build-base-docker.sh               |   29 +
 tools/docker/start-compile-docker.sh            |   67 +
 wms/pom.xml                                     |    2 +-
 78 files changed, 3434 insertions(+), 2650 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9291936e/dcs/pom.xml
----------------------------------------------------------------------
diff --cc dcs/pom.xml
index 351c5ca,d8104f3..445e365
--- a/dcs/pom.xml
+++ b/dcs/pom.xml
@@@ -491,7 -498,7 +491,7 @@@
    	<compileSource>1.6</compileSource>
      
    	<!-- Dependencies -->
-         <hadoop.version>2.6.0</hadoop.version>
 -    <hadoop.version>${env.HADOOP_DEP_VER}</hadoop.version>
++        <hadoop.version>${env.HADOOP_DEP_VER}</hadoop.version>
    	<commons-cli.version>1.2</commons-cli.version>
    	<commons-codec.version>1.4</commons-codec.version>
    	<commons-io.version>2.1</commons-io.version>


Mime
View raw message