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 2017/05/31 03:23:57 UTC
[3/4] incubator-trafodion git commit: Fixes for CLOB datatype
Fixes for CLOB datatype
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8fb47efb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8fb47efb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8fb47efb
Branch: refs/heads/master
Commit: 8fb47efb74fe8f5f2e88696a5e891a9ac362f229
Parents: 14c02c1
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Thu May 25 20:59:59 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Thu May 25 20:59:59 2017 +0000
----------------------------------------------------------------------
core/sql/cli/CliExpExchange.cpp | 2 +-
core/sql/generator/GenPreCode.cpp | 3 ++-
core/sql/sqlci/Param.cpp | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8fb47efb/core/sql/cli/CliExpExchange.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliExpExchange.cpp b/core/sql/cli/CliExpExchange.cpp
index 4c18fc3..8740b9d 100644
--- a/core/sql/cli/CliExpExchange.cpp
+++ b/core/sql/cli/CliExpExchange.cpp
@@ -4187,7 +4187,7 @@ InputOutputExpr::inputValues(atp_struct *atp,
if (noDatetimeValidation())
convFlags |= CONV_NO_DATETIME_VALIDATION;
- if (sourceType==REC_BLOB)
+ if ((sourceType==REC_BLOB) || (sourceType ==REC_CLOB))
{
// the first 4 bytes of data are actually the variable
// length indicator
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8fb47efb/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp
index 438464a..11aa83f 100644
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@ -5648,7 +5648,8 @@ RelExpr * HbaseInsert::preCodeGen(Generator * generator,
ItemExpr * liChild = li->child(0);
ItemExpr * liChild1 = li->child(1);
li = new(generator->wHeap())
- LOBinsert(liChild, liChild1, li->getObj());
+ LOBinsert(liChild, liChild1, li->getObj(),FALSE,
+ li->lobAsVarchar());
li->insertedTableObjectUID() =
getIndexDesc()->getPrimaryTableDesc()->
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8fb47efb/core/sql/sqlci/Param.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlci/Param.cpp b/core/sql/sqlci/Param.cpp
index a357838..835eceb 100644
--- a/core/sql/sqlci/Param.cpp
+++ b/core/sql/sqlci/Param.cpp
@@ -347,6 +347,7 @@ short Param::convertValue(SqlciEnv * sqlci_env, short targetType,
case REC_NCHAR_F_UNICODE:
case REC_NCHAR_V_UNICODE:
case REC_BLOB:
+ case REC_CLOB:
{
char *VCLen = NULL;
short VCLenSize = 0;