trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [6/8] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into sean_2095
Date Mon, 18 Jul 2016 22:40:58 GMT
Merge branch 'master' of github.com:apache/incubator-trafodion into sean_2095

Conflicts:
	core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java


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

Branch: refs/heads/master
Commit: 440123ab824fa6b57ac38293874ca3958e3ffba7
Parents: b452921 e9d7ba4
Author: Sean Broeder <sbroeder@edev06.esgyn.local>
Authored: Sun Jul 17 04:05:04 2016 +0000
Committer: Sean Broeder <sbroeder@edev06.esgyn.local>
Committed: Sun Jul 17 04:05:04 2016 +0000

----------------------------------------------------------------------
 core/conn/jdbcT4/pom.xml                        |    6 +
 .../trafodion/jdbc/t4/InterfaceResultSet.java   |    9 +
 .../trafodion/jdbc/t4/T4DatabaseMetaData.java   |    8 +-
 core/conn/odb/Makefile                          |    2 +-
 core/conn/odb/src/odb.c                         |    3 +-
 .../odbc/src/odbc/nsksrvrcore/sqlinterface.cpp  |   10 +
 .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp    |  280 ++-
 core/conn/trafci/.gitignore                     |    1 +
 .../sql/scripts/install_hadoop_regr_test_env    |  372 +++-
 .../hbase/client/transactional/TmDDL.java       |   65 +-
 .../transactional/TrxRegionEndpoint.java.tmpl   |    4 +-
 .../trafodion/dtm/HBaseAuditControlPoint.java   |  150 +-
 .../main/java/org/trafodion/dtm/HBaseTmZK.java  |   22 +-
 .../java/org/trafodion/dtm/HBaseTxClient.java   |  508 +++---
 .../java/org/trafodion/dtm/TmAuditTlog.java     |  332 +---
 .../main/java/org/trafodion/dtm/TrafInfo.java   |   12 +-
 core/sql/bin/SqlciErrors.txt                    |    2 +-
 core/sql/cli/Cli.cpp                            |   17 +-
 core/sql/cli/Cli.h                              |    3 +-
 core/sql/cli/CliExtern.cpp                      |    3 +-
 core/sql/cli/Context.cpp                        |   61 +-
 core/sql/cli/Context.h                          |   17 +-
 core/sql/cli/sqlcli.h                           |    4 +
 core/sql/common/BaseTypes.cpp                   |   12 +
 core/sql/common/ComSmallDefs.h                  |    6 +
 core/sql/common/MiscType.cpp                    |  150 +-
 core/sql/common/MiscType.h                      |  112 +-
 core/sql/common/NAType.cpp                      |    8 +
 core/sql/common/NumericType.cpp                 |   18 -
 core/sql/common/NumericType.h                   |   33 +-
 core/sql/common/SQLTypeDefs.h                   |    2 +
 core/sql/common/dfs2rec.h                       |   13 +-
 core/sql/common/str.cpp                         |   40 +-
 core/sql/common/str.h                           |   12 +-
 core/sql/executor/ExExeUtil.h                   |    3 +-
 core/sql/executor/ExExeUtilCli.cpp              |    4 +-
 core/sql/executor/ExExeUtilGet.cpp              |    8 +-
 core/sql/executor/ExExeUtilLoad.cpp             |   49 +-
 core/sql/executor/ExExeUtilMisc.cpp             |    5 +-
 core/sql/executor/ExFastTransport.cpp           |    6 +-
 core/sql/executor/ExHbaseIUD.cpp                |   13 +-
 core/sql/executor/ExHdfsScan.cpp                |   84 +-
 core/sql/executor/ExHdfsScan.h                  |    1 -
 core/sql/executor/JavaObjectInterface.cpp       |    4 +-
 core/sql/executor/ex_globals.cpp                |   14 +-
 core/sql/executor/ex_globals.h                  |    4 +-
 core/sql/executor/ex_root.cpp                   |   13 +-
 core/sql/executor/ex_split_bottom.cpp           |    2 +-
 core/sql/exp/ExpErrorEnums.h                    |    1 +
 core/sql/exp/ExpLOB.cpp                         |  107 +-
 core/sql/exp/ExpLOB.h                           |   18 +-
 core/sql/exp/ExpLOBaccess.cpp                   |  232 ++-
 core/sql/exp/ExpLOBaccess.h                     |   17 +-
 core/sql/exp/ExpLOBinterface.cpp                |  165 +-
 core/sql/exp/ExpLOBinterface.h                  |    7 +-
 core/sql/exp/ExpPCode.cpp                       |   68 +-
 core/sql/exp/ExpPCodeClauseGen.cpp              |  398 +++--
 core/sql/exp/ExpPCodeExpGen.cpp                 |    5 +-
 core/sql/exp/ExpPCodeInstruction.h              |   41 +-
 core/sql/exp/ExpPCodeOptimizations.cpp          |  103 +-
 core/sql/exp/ExpPCodeOptsConstProp.cpp          |    6 +
 core/sql/exp/exp_arith.cpp                      |    6 +-
 core/sql/exp/exp_attrs.cpp                      |    2 +
 core/sql/exp/exp_clause.cpp                     |    3 +-
 core/sql/exp/exp_clause_derived.h               |   77 +-
 core/sql/exp/exp_comp.cpp                       |   61 +
 core/sql/exp/exp_conv.cpp                       |  114 +-
 core/sql/exp/exp_eval.cpp                       |  222 ++-
 core/sql/exp/exp_expr.cpp                       |    2 -
 core/sql/exp/exp_expr.h                         |   23 +-
 core/sql/exp/exp_fixup.cpp                      |   93 +-
 core/sql/exp/exp_function.cpp                   |   49 +-
 core/sql/exp/exp_math_func.cpp                  |   18 +-
 core/sql/generator/GenExpGenerator.cpp          |   97 +-
 core/sql/generator/GenExpGenerator.h            |    3 +
 core/sql/generator/GenItemExpr.cpp              |   19 +
 core/sql/generator/GenPreCode.cpp               |   88 +-
 core/sql/generator/GenRelJoin.cpp               |    7 +-
 core/sql/generator/GenRelMisc.cpp               |    3 -
 core/sql/generator/Generator.cpp                |   17 +-
 core/sql/generator/Generator.h                  |   21 -
 core/sql/optimizer/BindItemExpr.cpp             |   25 +
 core/sql/optimizer/BindRelExpr.cpp              |   49 +-
 core/sql/optimizer/ControlDB.cpp                |   10 +-
 core/sql/optimizer/EncodedValue.cpp             |    1 +
 core/sql/optimizer/HDFSHook.cpp                 |   31 +-
 core/sql/optimizer/ItemArith.h                  |   32 +
 core/sql/optimizer/ItemExpr.cpp                 |   30 +-
 core/sql/optimizer/NAColumn.cpp                 |    4 +
 core/sql/optimizer/NATable.cpp                  |    9 +
 core/sql/optimizer/NormItemExpr.cpp             |    2 +-
 core/sql/optimizer/OptRange.cpp                 |   24 +-
 core/sql/optimizer/RelExeUtil.cpp               |    6 +
 core/sql/optimizer/SynthType.cpp                |   70 +-
 core/sql/optimizer/UdfDllInteraction.cpp        |   23 +
 core/sql/optimizer/ValueDesc.cpp                |   29 +-
 core/sql/parser/ParKeyWords.cpp                 |    2 +-
 core/sql/parser/SqlParserAux.cpp                |    8 +-
 core/sql/parser/sqlparser.y                     |   41 +-
 core/sql/parser/ulexer.cpp                      |    3 +-
 core/sql/regress/compGeneral/EXPECTED071        |    4 +-
 core/sql/regress/core/EXPECTED037.SB            |    4 +-
 core/sql/regress/core/EXPECTED038.LINUX         |   22 +-
 core/sql/regress/core/TEST037                   |    2 +-
 core/sql/regress/executor/EXPECTED002.SB        |   68 +-
 core/sql/regress/executor/EXPECTED012           |   36 +-
 core/sql/regress/executor/EXPECTED022.SB        |   18 +-
 core/sql/regress/executor/TEST012               |   15 +-
 core/sql/regress/hive/EXPECTED005               |   16 +-
 core/sql/regress/hive/EXPECTED015               |   60 +-
 core/sql/regress/hive/EXPECTED018               |  204 +--
 core/sql/regress/hive/TEST005                   |    2 +-
 core/sql/regress/hive/TEST018                   |   22 +-
 core/sql/regress/seabase/EXPECTED003            | 1624 +++++++++++++++---
 core/sql/regress/seabase/EXPECTED010            |  378 ++--
 core/sql/regress/seabase/EXPECTED030            |   14 +
 core/sql/regress/seabase/EXPECTED031            |   76 +
 core/sql/regress/seabase/TEST003                |  169 +-
 core/sql/regress/seabase/TEST030                |    2 +
 core/sql/regress/seabase/TEST031                |   13 +
 core/sql/regress/tools/regrhive.ksh             |    2 +-
 core/sql/regress/tools/runregr_hive.ksh         |    4 +-
 core/sql/regress/tools/runregr_seabase.ksh      |    7 +-
 core/sql/regress/udr/EXPECTED001                |   30 +-
 core/sql/regress/udr/TEST001                    |    7 +
 core/sql/sqlci/Formatter.cpp                    |    5 +
 core/sql/sqlci/Param.cpp                        |    1 +
 core/sql/sqlci/SqlciEnv.cpp                     |    4 +
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   15 +-
 core/sql/sqlcomp/CmpSeabaseDDLutil.cpp          |    2 +
 core/sql/sqlcomp/DefaultConstants.h             |    8 +
 core/sql/sqlcomp/nadefaults.cpp                 |    4 +
 .../java/org/trafodion/sql/HBaseClient.java     |   14 +-
 .../java/org/trafodion/sql/HBulkLoadClient.java |   31 +-
 .../java/org/trafodion/sql/HTableClient.java    |   21 +-
 .../java/org/trafodion/sql/OrcFileReader.java   |   52 +-
 .../org/trafodion/sql/SequenceFileWriter.java   |   75 +-
 install/Makefile                                |    2 +-
 install/installer/traf_apache_mods              |    7 +
 install/installer/traf_cloudera_mods            |    9 +
 install/installer/traf_hortonworks_mods         |    8 +
 141 files changed, 5511 insertions(+), 2545 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/440123ab/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TmDDL.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/440123ab/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/440123ab/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
----------------------------------------------------------------------
diff --cc core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
index ae058de,c4cb7dc..682150c
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
@@@ -676,39 -688,13 +688,41 @@@ public class HBaseTxClient 
           LOG.error("Returning from HBaseTxClient:callCreateTable, (null tx) retval: " +
TransReturnCode.RET_NOTX.getShort()  + " txid: " + transactionId);
           return TransReturnCode.RET_NOTX.getShort();
        }
- 
        try {
           htdesc = HTableDescriptor.parseFrom(pv_htbldesc);
+       } catch (DeserializationException de) {
+          LOG.error("Error while getting HTableDescriptor caused by : ", de);
+          throw new IOException("Error while getting HTableDescriptor caused by : ", de);
        }
 -      trxManager.createTable(ts, htdesc, beginEndKeys);
 +      catch(Exception e) {
 +         if (LOG.isTraceEnabled()) LOG.trace("HBaseTxClient:callCreateTable exception in
htdesc parseFrom, retval: " +
 +            TransReturnCode.RET_EXCEPTION.toString() +
 +            " txid: " + transactionId +
 +            " DeserializationException: " + e);
 +         StringWriter sw = new StringWriter();
 +         PrintWriter pw = new PrintWriter(sw);
 +         e.printStackTrace(pw);
 +         LOG.error(sw.toString());
 +
 +         throw new Exception("DeserializationException in callCreateTable parseFrom, unable
to send callCreateTable");
 +      }
 +
 +      try {
 +         trxManager.createTable(ts, htdesc, beginEndKeys);
 +      }
 +      catch (Exception cte) {
 +         if (LOG.isTraceEnabled()) LOG.trace("HBaseTxClient:callCreateTable exception trxManager.createTable,
retval: " +
 +            TransReturnCode.RET_EXCEPTION.toString() +" txid: " + transactionId +" Exception:
" + cte);
 +         StringWriter sw = new StringWriter();
 +         PrintWriter pw = new PrintWriter(sw);
 +         cte.printStackTrace(pw);
 +         LOG.error("HBaseTxClient createTable call error: " + sw.toString());
 +
 +         throw new Exception("createTable call error");
 +      }
 +
 +      
 +      if (LOG.isTraceEnabled()) LOG.trace("Exit callCreateTable, txid: [" + transactionId
+ "] returning RET_OK");
        return TransReturnCode.RET_OK.getShort();
     }
  


Mime
View raw message