trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sand...@apache.org
Subject [1/4] incubator-trafodion git commit: Merge branch 'master' into testb
Date Mon, 26 Oct 2015 14:54:26 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 393eae3c1 -> 2578f5109


Merge branch 'master' into testb


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

Branch: refs/heads/master
Commit: 05005f9b82785261a10c960796ebff50424e04f9
Parents: a4a8365 a266807
Author: Roberta Marton <roberta.marton@esgyn.com>
Authored: Fri Oct 23 16:11:00 2015 +0000
Committer: Roberta Marton <roberta.marton@esgyn.com>
Committed: Fri Oct 23 16:11:00 2015 +0000

----------------------------------------------------------------------
 core/sqf/sql/scripts/dcsstart                   |    4 +-
 core/sqf/sql/scripts/dcsstop                    |    4 +-
 core/sqf/sql/scripts/install_local_hadoop       |   15 +-
 core/sqf/sql/scripts/install_traf_components    |   19 +-
 core/sqf/sql/scripts/reststart                  |    4 +-
 core/sqf/sql/scripts/reststop                   |    4 +-
 .../transactional/TransactionManager.java       |  204 +-
 .../client/transactional/TransactionState.java  |   10 +
 .../transactional/TransactionalReturn.java      |    1 +
 .../transactional/TransactionalTable.java       |  285 +-
 .../transactional/SplitBalanceHelper.java       |  319 ++
 .../transactional/TrxRegionEndpoint.java        |  272 +-
 .../transactional/TrxRegionObserver.java        |  232 +-
 .../generated/TrxRegionProtos.java              | 3001 +++++++++++++++++-
 .../transactional/TransactionState.java         |   13 +
 .../transactional/TrxTransactionState.java      |    6 +
 .../hbase-trx/src/main/protobuf/TrxRegion.proto |   21 +
 core/sql/export/NAStringDef.h                   |    2 +
 core/sql/optimizer/EncodedKeyValue.cpp          |    3 +-
 core/sql/optimizer/EncodedKeyValue.h            |    1 +
 core/sql/optimizer/ItemColRef.h                 |    2 +
 core/sql/optimizer/ItemExpr.cpp                 |   90 +
 core/sql/optimizer/ItemExpr.h                   |    4 +
 core/sql/optimizer/NAFileSet.cpp                |   13 +
 core/sql/optimizer/NAFileSet.h                  |    6 +
 core/sql/optimizer/NATable.cpp                  |   67 +-
 core/sql/optimizer/PartFunc.cpp                 |  127 +
 core/sql/optimizer/PartFunc.h                   |   18 +
 core/sql/optimizer/RelExpr.cpp                  |   14 +-
 core/sql/optimizer/RelScan.h                    |    9 +-
 core/sql/optimizer/ScanOptimizer.cpp            |    6 +
 core/sql/optimizer/ValueDesc.cpp                |  118 +-
 core/sql/optimizer/ValueDesc.h                  |   17 +
 core/sql/qms/QmsJoinGraph.h                     |    1 -
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |    1 +
 .../org/trafodion/dcs/master/DcsMaster.java     |    7 +-
 .../org/trafodion/dcs/servermt/DcsServer.java   |    5 +
 install/installer/traf_add_user                 |    4 -
 install/installer/traf_cloudera_mods98          |    7 +
 install/installer/traf_config_check             |   12 +-
 install/installer/traf_config_setup             |    2 +-
 install/installer/traf_getHadoopNodes           |   27 +-
 install/installer/traf_hortonworks_mods98       |    8 +-
 install/installer/trafodion_config_default      |   32 +-
 install/installer/trafodion_install             |   51 +-
 45 files changed, 4644 insertions(+), 424 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/05005f9b/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
diff --cc core/sqf/sql/scripts/install_local_hadoop
index 77db26f,7067107..66e5494
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@@ -1534,21 -1544,13 +1544,16 @@@ f
  
  cd $MY_SW_ROOT
  
 -if [ ! -r $YARN_HOME/lib/native/libhdfs.so ]; then
 -  echo "------------------------------------------------------------"
 -  echo "-- WARNING: libhdfs.so is not present on this system. Please"
 -  echo "--          build it, otherwise Trafodion will not compile."
 -  echo "------------------------------------------------------------"
 +if [[ -n "$VERBOSE" ]]; then
 +
 +  if [ ! -r $YARN_HOME/lib/native/libhdfs.so ]; then
 +    echo "------------------------------------------------------------"
 +    echo "-- WARNING: libhdfs.so is not present on this system. Please"
 +    echo "--          build it, otherwise Trafodion will not compile."
 +    echo "------------------------------------------------------------"
 +  fi
  fi
  
- #For clients
- cat >$HOME/.traf-clports-$USER <<EOF
- HADOOP_START_PORT=$MY_START_PORT
- EOF
- 
  echo
  echo "Installed directory size and name = $(du -sh $MY_SW_ROOT)" | tee -a ${MY_LOG_FILE}
  echo


Mime
View raw message