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/16 21:44:48 UTC
[2/3] incubator-trafodion git commit: Merge remote branch
'origin/pr/388/head' into merge_trafodion388
Merge remote branch 'origin/pr/388/head' into merge_trafodion388
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a7f2f277
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a7f2f277
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a7f2f277
Branch: refs/heads/master
Commit: a7f2f277d467baa3ac08ee1fb5d9cf93c9dee50f
Parents: 5a6549b cf5390e
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Wed Mar 16 20:41:12 2016 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Wed Mar 16 20:41:12 2016 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 2 +-
core/sql/common/ComSmallDefs.h | 4 +-
core/sql/exp/ExpLOB.cpp | 16 ++---
core/sql/sqlcomp/CmpSeabaseDDL.h | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 11 ++++
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 84 ++++++++++++++++++++-------
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 9 +--
7 files changed, 92 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a7f2f277/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a7f2f277/core/sql/exp/ExpLOB.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a7f2f277/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --cc core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index ce3349b,a4b74e3..8d20873
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@@ -2224,12 -2224,9 +2224,13 @@@ short CmpSeabaseDDL::createSeabaseTable
}
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)
{
+ Int32 rc = sendAllControls(FALSE, FALSE, TRUE);
//if the table is a volatile table return an error
if (createTableNode->isVolatile())
{