You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2016/03/09 19:44:06 UTC
[08/11] incubator-trafodion git commit: Merge remote branch
'origin/master' into lob_gc_work
Merge remote branch 'origin/master' into lob_gc_work
Conflicts:
core/sql/sqlcomp/CmpSeabaseDDLtable.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/69fbcc98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/69fbcc98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/69fbcc98
Branch: refs/heads/master
Commit: 69fbcc981d64a6dfc3f1340166ed5f4a09ec3604
Parents: 9503519 1824c7e
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Thu Mar 3 17:41:00 2016 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Thu Mar 3 17:41:00 2016 +0000
----------------------------------------------------------------------
core/.gitignore | 1 +
core/Makefile | 5 +-
core/sqf/Makefile | 32 +-
core/sqf/hbase_utilities/pom.xml | 2 +-
core/sqf/makelink | 33 -
core/sqf/sqenvcom.sh | 43 +-
core/sqf/sql/scripts/install_local_hadoop | 6 +-
core/sqf/src/seatrans/hbase-trx/Makefile | 16 +-
core/sqf/src/seatrans/hbase-trx/genvers | 3 +-
.../seatrans/hbase-trx/hbase-protocol/pom.xml | 191 --
core/sqf/src/seatrans/hbase-trx/pom.xml | 342 ---
.../transactional/TransactionManager.java | 22 +-
.../transactional/TransactionalScanner.java | 14 +-
core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml | 6 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 14 +-
.../java/org/trafodion/dtm/TmAuditTlog.java | 23 +-
core/sql/arkcmp/CmpContext.cpp | 12 +-
core/sql/arkcmp/CmpContext.h | 18 +
core/sql/arkcmp/CmpStatement.cpp | 19 +-
core/sql/arkcmp/CmpStatement.h | 1 +
core/sql/bin/SqlciErrors.txt | 1 +
core/sql/cli/Context.cpp | 106 +-
core/sql/cli/Context.h | 13 +-
core/sql/cli/ExSqlComp.cpp | 5 +
core/sql/cli/Statement.cpp | 36 +-
core/sql/comexe/CmpMessage.h | 23 +
core/sql/comexe/ComTdbHbaseAccess.cpp | 3 +
core/sql/comexe/ComTdbHbaseAccess.h | 4 +-
core/sql/common/ComSmallDefs.h | 11 +
core/sql/common/DateTimeType.cpp | 3 +-
core/sql/executor/ExExeUtil.h | 1 +
core/sql/executor/ExExeUtilGet.cpp | 55 +-
core/sql/executor/ExFirstN.cpp | 45 +-
core/sql/executor/ExFirstN.h | 4 +-
core/sql/executor/ExHbaseAccess.cpp | 22 +-
core/sql/executor/ExHbaseAccess.h | 1 +
core/sql/executor/ExHbaseIUD.cpp | 11 +-
core/sql/executor/ExStats.cpp | 13 +-
core/sql/executor/HBaseClient_JNI.cpp | 41 +-
core/sql/executor/HBaseClient_JNI.h | 7 +-
core/sql/executor/ex_ddl.cpp | 2 +
core/sql/executor/ex_transaction.cpp | 278 ++-
core/sql/executor/ex_transaction.h | 2 +-
core/sql/exp/ExpHbaseInterface.cpp | 34 +-
core/sql/exp/ExpHbaseInterface.h | 16 +-
core/sql/generator/GenPreCode.cpp | 13 -
core/sql/generator/GenRelExeUtil.cpp | 31 +-
core/sql/generator/GenRelMisc.cpp | 13 +-
core/sql/generator/GenRelUpdate.cpp | 112 +-
core/sql/generator/Generator.cpp | 5 +
core/sql/lib_mgmt/.gitignore | 7 +
core/sql/lib_mgmt/Makefile | 35 +
core/sql/lib_mgmt/README.rst | 63 +
core/sql/lib_mgmt/pom.xml | 108 +
.../java/org/trafodion/libmgmt/FileMgmt.java | 645 ++++++
.../java/org/trafodion/libmgmt/Vproc.java.tmpl | 35 +
.../lib_mgmt/src/main/resources/init_libmgmt.sh | 206 ++
.../com/trafodion/libmgmt/JarFileMgmtTest.java | 27 +
core/sql/nskgmake/Makerules.linux | 19 +-
core/sql/optimizer/BindRelExpr.cpp | 86 +-
core/sql/optimizer/ItemOther.h | 7 +
core/sql/optimizer/NAColumn.h | 43 +-
core/sql/optimizer/NARoutine.cpp | 2 +-
core/sql/optimizer/NARoutineDB.h | 5 +-
core/sql/optimizer/NATable.cpp | 58 +-
core/sql/optimizer/NATable.h | 10 +-
core/sql/optimizer/RelExeUtil.cpp | 155 +-
core/sql/optimizer/RelExeUtil.h | 30 +-
core/sql/optimizer/RelExpr.cpp | 2 +-
core/sql/optimizer/RelUpdate.h | 2 +
core/sql/parser/SqlParserAux.cpp | 2 +-
core/sql/parser/StmtDDLAlter.cpp | 11 +
.../sql/parser/StmtDDLAlterTableAlterColumn.cpp | 20 +-
core/sql/parser/StmtDDLAlterTableAlterColumn.h | 17 +-
core/sql/parser/StmtDDLNode.cpp | 14 +
core/sql/parser/StmtDDLNode.h | 15 +-
core/sql/parser/sqlparser.y | 6 +-
core/sql/pom.xml | 10 +-
core/sql/regress/charsets/DIFF012.KNOWN.SB | 2 +
core/sql/regress/compGeneral/EXPECTED071 | 8 +-
core/sql/regress/core/DIFF116.KNOWN.SB | 21 +
core/sql/regress/core/EXPECTED056.SB | 75 +-
core/sql/regress/core/EXPECTED116 | 542 +++--
core/sql/regress/core/TEST029 | 2 +-
core/sql/regress/core/TEST056 | 7 +-
core/sql/regress/core/TEST116 | 123 +-
core/sql/regress/executor/EXPECTED013.SB | 39 +-
core/sql/regress/executor/EXPECTED140 | 40 +-
core/sql/regress/fullstack2/EXPECTED062 | 3 +
core/sql/regress/fullstack2/EXPECTED062.RELEASE | 3 +
core/sql/regress/privs2/EXPECTED135 | 329 ---
core/sql/regress/privs2/EXPECTED138 | 2 +-
core/sql/regress/privs2/EXPECTED142 | 760 +++++++
core/sql/regress/privs2/TEST135 | 43 -
core/sql/regress/privs2/TEST142 | 280 +++
core/sql/regress/seabase/EXPECTED010 | 460 ++--
core/sql/regress/seabase/EXPECTED011 | 102 +-
core/sql/regress/seabase/EXPECTED016 | 35 +-
core/sql/regress/seabase/EXPECTED020 | 233 ++
core/sql/regress/seabase/EXPECTED027 | 433 +++-
core/sql/regress/seabase/TEST011 | 16 -
core/sql/regress/seabase/TEST020 | 54 +
core/sql/regress/seabase/TEST027 | 58 +
core/sql/regress/tools/runregr_catman1.ksh | 3 +-
core/sql/regress/tools/runregr_charsets.ksh | 3 +-
core/sql/regress/tools/runregr_compGeneral.ksh | 3 +-
core/sql/regress/tools/runregr_core.ksh | 3 +-
core/sql/regress/tools/runregr_executor.ksh | 3 +-
core/sql/regress/tools/runregr_fullstack2.ksh | 3 +-
core/sql/regress/tools/runregr_hive.ksh | 4 +-
core/sql/regress/tools/runregr_privs1.ksh | 3 +-
core/sql/regress/tools/runregr_privs2.ksh | 3 +-
core/sql/regress/tools/runregr_qat.ksh | 3 +-
core/sql/regress/tools/runregr_seabase.ksh | 4 +-
core/sql/regress/tools/runregr_udr.ksh | 9 +-
core/sql/regress/tools/sbdefs | 1 +
core/sql/sqlcomp/CmpDescribe.cpp | 186 +-
core/sql/sqlcomp/CmpSeabaseDDL.h | 104 +-
core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 42 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 490 +++--
core/sql/sqlcomp/CmpSeabaseDDLindex.cpp | 98 +-
core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 8 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 26 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 1999 ++++++++++++------
core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp | 14 +-
core/sql/sqlcomp/CmpSeabaseDDLupgrade.h | 6 +-
core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 30 +-
core/sql/sqlcomp/DefaultConstants.h | 8 +
core/sql/sqlcomp/PrivMgrDefs.h | 4 +-
core/sql/sqlcomp/PrivMgrMD.cpp | 171 +-
core/sql/sqlcomp/PrivMgrMD.h | 132 +-
core/sql/sqlcomp/PrivMgrPrivileges.cpp | 793 ++++---
core/sql/sqlcomp/PrivMgrPrivileges.h | 48 +-
core/sql/sqlcomp/nadefaults.cpp | 9 +-
.../java/org/trafodion/sql/HBaseClient.java | 70 +-
licenses/lic-clients-bin | 36 +-
137 files changed, 7688 insertions(+), 3657 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/69fbcc98/core/sql/comexe/ComTdbHbaseAccess.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/69fbcc98/core/sql/comexe/ComTdbHbaseAccess.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/69fbcc98/core/sql/executor/ExHbaseAccess.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/69fbcc98/core/sql/executor/ExHbaseIUD.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/69fbcc98/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/69fbcc98/core/sql/generator/GenRelUpdate.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/69fbcc98/core/sql/optimizer/NATable.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/69fbcc98/core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/69fbcc98/core/sql/sqlcomp/CmpSeabaseDDLindex.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/69fbcc98/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --cc core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index 276673f,fb9c802..ce3349b
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@@ -2143,105 -2171,104 +2171,111 @@@ short CmpSeabaseDDL::createSeabaseTable
return -1;
}
}
-
- HbaseStr hbaseTable;
- hbaseTable.val = (char*)extNameForHbase.data();
- hbaseTable.len = extNameForHbase.length();
- if (createHbaseTable(ehi, &hbaseTable, trafColFamVec,
- &hbaseCreateOptions,
- numSplits, keyLength,
- encodedKeysBuffer) == -1)
- {
- deallocEHI(ehi);
-
- processReturn();
-
- return -2;
- }
-
- // if this table has lob columns, create the lob files
- short *lobNumList = new (STMTHEAP) short[numCols];
- short *lobTypList = new (STMTHEAP) short[numCols];
- char **lobLocList = new (STMTHEAP) char*[numCols];
- Lng32 j = 0;
- for (Int32 i = 0; i < colArray.entries(); i++)
- {
- ElemDDLColDef *column = colArray[i];
+
+ NABoolean ddlXns = createTableNode->ddlXns();
+ HbaseStr hbaseTable;
+ hbaseTable.val = (char*)extNameForHbase.data();
+ hbaseTable.len = extNameForHbase.length();
+ if (createHbaseTable(ehi, &hbaseTable, trafColFamVec,
+ &hbaseCreateOptions,
+ numSplits, keyLength,
+ encodedKeysBuffer,
+ FALSE, ddlXns
+ ) == -1)
+ {
+ deallocEHI(ehi);
- Lng32 datatype = column->getColumnDataType()->getFSDatatype();
- if ((datatype == REC_BLOB) ||
- (datatype == REC_CLOB))
- {
-
- lobNumList[j] = i; //column->getColumnNumber();
- lobTypList[j] =
- (short)(column->getLobStorage() == Lob_Invalid_Storage
+ processReturn();
+
+ return -2;
+ }
+
+ // if this table has lob columns, create the lob files
+ short *lobNumList = new (STMTHEAP) short[numCols];
+ short *lobTypList = new (STMTHEAP) short[numCols];
+ char **lobLocList = new (STMTHEAP) char*[numCols];
+ Lng32 j = 0;
+ for (Int32 i = 0; i < colArray.entries(); i++)
+ {
+ ElemDDLColDef *column = colArray[i];
+
+ Lng32 datatype = column->getColumnDataType()->getFSDatatype();
+ if ((datatype == REC_BLOB) ||
+ (datatype == REC_CLOB))
+ {
+
+ lobNumList[j] = i; //column->getColumnNumber();
+ lobTypList[j] =
+ (short)(column->getLobStorage() == Lob_Invalid_Storage
? Lob_HDFS_File : column->getLobStorage());
- // lobTypList[j] = (short)
- // CmpCommon::getDefaultNumeric(LOB_STORAGE_TYPE);
- char * loc = new (STMTHEAP) char[1024];
+ // lobTypList[j] = (short)
+ // CmpCommon::getDefaultNumeric(LOB_STORAGE_TYPE);
+ char * loc = new (STMTHEAP) char[1024];
- const char* f = ActiveSchemaDB()->getDefaults().
- getValue(LOB_STORAGE_FILE_DIR);
+ const char* f = ActiveSchemaDB()->getDefaults().
+ getValue(LOB_STORAGE_FILE_DIR);
- strcpy(loc, f);
+ strcpy(loc, f);
- lobLocList[j] = loc;
- j++;
- }
+ lobLocList[j] = loc;
+ j++;
+ }
}
-
+
Int64 lobMaxSize = CmpCommon::getDefaultNumeric(LOB_MAX_SIZE)*1024*1024;
++
+ const char *lobHdfsServer = CmpCommon::getDefaultString(LOB_HDFS_SERVER);
+ Int32 lobHdfsPort = (Lng32)CmpCommon::getDefaultNumeric(LOB_HDFS_PORT);
- if (j > 0)
- {
- //if the table is a volatile table return an error
- if (createTableNode->isVolatile())
- {
- *CmpCommon::diags()
++
+ if (j > 0)
+ {
+ //if the table is a volatile table return an error
+ if (createTableNode->isVolatile())
+ {
+ *CmpCommon::diags()
<< DgSqlCode(-CAT_LOB_COLUMN_IN_VOLATILE_TABLE)
<< DgTableName(extTableName);
deallocEHI(ehi);
processReturn();
return -1;
- }
- Int64 objUID = getObjectUID(&cliInterface,
- catalogNamePart.data(), schemaNamePart.data(),
- objectNamePart.data(),
- COM_BASE_TABLE_OBJECT_LIT);
+ }
+ Int64 objUID = getObjectUID(&cliInterface,
+ catalogNamePart.data(), schemaNamePart.data(),
+ objectNamePart.data(),
+ COM_BASE_TABLE_OBJECT_LIT);
-
+
- ComString newSchName = "\"";
- newSchName += catalogNamePart;
- newSchName.append("\".\"");
- newSchName.append(schemaNamePart);
- newSchName += "\"";
- Lng32 rc = SQL_EXEC_LOBddlInterface((char*)newSchName.data(),
- newSchName.length(),
- objUID,
- j,
- LOB_CLI_CREATE,
- lobNumList,
- lobTypList,
- lobLocList,
- (char *)lobHdfsServer,
- lobHdfsPort,
- lobMaxSize);
+ ComString newSchName = "\"";
+ newSchName += catalogNamePart;
+ newSchName.append("\".\"");
+ newSchName.append(schemaNamePart);
+ newSchName += "\"";
+ Lng32 rc = SQL_EXEC_LOBddlInterface((char*)newSchName.data(),
+ newSchName.length(),
+ objUID,
+ j,
+ LOB_CLI_CREATE,
+ lobNumList,
+ lobTypList,
+ lobLocList,
++ (char *)lobHdfsServer,
++ lobHdfsPort,
+ lobMaxSize);
-
+
- if (rc < 0)
- {
- //sss TBD need to retrive the cli diags here.
- *CmpCommon::diags() << DgSqlCode(-CAT_CREATE_OBJECT_ERROR)
- << DgTableName(extTableName);
- deallocEHI(ehi);
- processReturn();
+ if (rc < 0)
+ {
+ //sss TBD need to retrive the cli diags here.
+ *CmpCommon::diags() << DgSqlCode(-CAT_CREATE_OBJECT_ERROR)
+ << DgTableName(extTableName);
+ deallocEHI(ehi);
+ processReturn();
-
+
- return -2;
- }
- }
+ return -2;
+ }
- } // j > 0
-
++ }
++
+
// if not a compound create, update valid def to true.
if (NOT ((createTableNode->getAddConstraintUniqueArray().entries() > 0) ||
(createTableNode->getAddConstraintRIArray().entries() > 0) ||
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/69fbcc98/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/69fbcc98/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------