You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/10/28 03:41:08 UTC
[1/4] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into wrk-brnch
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 7cf4caa53 -> 397e06b16
Merge branch 'master' of github.com:apache/incubator-trafodion into wrk-brnch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5977ca57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5977ca57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5977ca57
Branch: refs/heads/master
Commit: 5977ca5712303261f145df8602650f6042fdfc8f
Parents: f43a24c 6abfe60
Author: Anuradha Hegde <he...@dev02.trafodion.org>
Authored: Wed Oct 21 21:10:40 2015 +0000
Committer: Anuradha Hegde <he...@dev02.trafodion.org>
Committed: Wed Oct 21 21:10:40 2015 +0000
----------------------------------------------------------------------
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 +
18 files changed, 429 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
[3/4] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into wrk-brnch
Posted by su...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion into wrk-brnch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6046ef70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6046ef70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6046ef70
Branch: refs/heads/master
Commit: 6046ef706ba2fdbdc015f666b602138055e2c55f
Parents: f13f269 7cf4caa
Author: Anuradha Hegde <he...@dev02.trafodion.org>
Authored: Tue Oct 27 04:55:35 2015 +0000
Committer: Anuradha Hegde <he...@dev02.trafodion.org>
Committed: Tue Oct 27 04:55:35 2015 +0000
----------------------------------------------------------------------
core/rest/pom.xml | 6 +-
core/sqf/sqenvcom.sh | 28 +-
core/sqf/sql/scripts/genms | 3 +
core/sqf/sql/scripts/install_local_hadoop | 13 +-
core/sql/comexe/ComTdbHbaseAccess.cpp | 4 +-
core/sql/comexe/ComTdbHbaseAccess.h | 6 +
core/sql/executor/ExHbaseIUD.cpp | 6 +-
core/sql/generator/GenExplain.cpp | 8 +
core/sql/generator/GenRelUpdate.cpp | 9 +
core/sql/generator/GenUdr.cpp | 5 +-
core/sql/optimizer/NAColumn.cpp | 4 +-
core/sql/optimizer/NAColumn.h | 2 +-
core/sql/optimizer/ScanOptimizer.cpp | 17 +-
core/sql/regress/hive/EXPECTED020 | 63 +-
core/sql/regress/hive/TEST020 | 27 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 2 +-
core/sql/sqlcomp/DefaultConstants.h | 4 +
core/sql/sqlcomp/nadefaults.cpp | 2 +
core/sql/sqludr/SqlUdrPredefLogReader.cpp | 983 ++++++++++---------
dcs/bin/dcs-daemon.sh | 6 +-
dcs/pom.xml | 8 +-
.../org/trafodion/dcs/master/DcsMaster.java | 7 +-
.../org/trafodion/dcs/servermt/DcsServer.java | 5 +
.../java/org/trafodion/jdbc_test/TestCat.java | 4 +-
install/traf_tools_setup.sh | 378 ++++---
pom.xml | 2 +-
26 files changed, 932 insertions(+), 670 deletions(-)
----------------------------------------------------------------------
[4/4] incubator-trafodion git commit: Moved sqgen step after
dcsinstaller and restinstaller
Posted by su...@apache.org.
Moved sqgen step after dcsinstaller and restinstaller
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/397e06b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/397e06b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/397e06b1
Branch: refs/heads/master
Commit: 397e06b16777932c0ccb1d23ab08996046de0e97
Parents: 6046ef7
Author: Anuradha Hegde <he...@dev02.trafodion.org>
Authored: Tue Oct 27 22:33:21 2015 +0000
Committer: Anuradha Hegde <he...@dev02.trafodion.org>
Committed: Tue Oct 27 22:33:21 2015 +0000
----------------------------------------------------------------------
install/installer/traf_start | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/397e06b1/install/installer/traf_start
----------------------------------------------------------------------
diff --git a/install/installer/traf_start b/install/installer/traf_start
index 2c8f54f..ad393a2 100755
--- a/install/installer/traf_start
+++ b/install/installer/traf_start
@@ -198,21 +198,6 @@ if [ "$node_count" -ne "1" ]; then
fi
fi
-echo "***INFO: starting sqgen" | tee -a $INSTALL_LOG
-cd $MY_SQROOT/sql/scripts
-sqgen
-SQGEN_RC=$?
-if [ "$SQGEN_RC" != "0" ]; then
- echo "***ERROR: sqgen failed with RC=$SQGEN_RC. Check install log file for details." | tee -a $INSTALL_LOG
- exit -1;
-fi
-#==========================================
-
-if [ "$node_count" -ne "1" ]; then
- echo "***INFO: copying $HOME/sqcert directory to all nodes" | tee -a $INSTALL_LOG
- $PDCP $MY_NODES -x $HOSTNAME -r $HOME/sqcert $HOME
-fi
-
#==========================================
# install dcs
@@ -234,6 +219,22 @@ if [ ! -z $REST_BUILD ]; then
fi
#==========================================
+echo "***INFO: starting sqgen" | tee -a $INSTALL_LOG
+cd $MY_SQROOT/sql/scripts
+sqgen
+SQGEN_RC=$?
+if [ "$SQGEN_RC" != "0" ]; then
+ echo "***ERROR: sqgen failed with RC=$SQGEN_RC. Check install log file for details." | tee -a $INSTALL_LOG
+ exit -1;
+fi
+#==========================================
+
+if [ "$node_count" -ne "1" ]; then
+ echo "***INFO: copying $HOME/sqcert directory to all nodes" | tee -a $INSTALL_LOG
+ $PDCP $MY_NODES -x $HOSTNAME -r $HOME/sqcert $HOME
+fi
+
+#==========================================
if [ "$node_count" -ne "1" ]; then
echo "***INFO: copying install to all nodes" | tee -a $INSTALL_LOG
[2/4] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into wrk-brnch
Posted by su...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion into wrk-brnch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f13f269c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f13f269c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f13f269c
Branch: refs/heads/master
Commit: f13f269c6e94a1e67b022c14920602b640cebd8c
Parents: 5977ca5 b8e46bd
Author: Anuradha Hegde <he...@dev02.trafodion.org>
Authored: Fri Oct 23 03:50:50 2015 +0000
Committer: Anuradha Hegde <he...@dev02.trafodion.org>
Committed: Fri Oct 23 03:50:50 2015 +0000
----------------------------------------------------------------------
.../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 +
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 +-
19 files changed, 4183 insertions(+), 324 deletions(-)
----------------------------------------------------------------------