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/03/22 17:29:24 UTC

[1/2] incubator-trafodion git commit: [TRAFODION-2541]"UPDATE LOB" default max lob size error

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master f7e27c5d1 -> 0d42cb6d8


[TRAFODION-2541]"UPDATE LOB" default max lob size error

The default lob max size for "UPDATE LOB" operator should be 10000MB
rather than 10000B


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

Branch: refs/heads/master
Commit: da024aa551d16e8cb25da10152c706699175fc12
Parents: 3c1c4ad
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Tue Mar 21 03:06:22 2017 +0000
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Tue Mar 21 03:45:13 2017 +0000

----------------------------------------------------------------------
 core/sql/generator/GenRelExeUtil.cpp | 2 +-
 core/sql/optimizer/ItemFunc.h        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/da024aa5/core/sql/generator/GenRelExeUtil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelExeUtil.cpp b/core/sql/generator/GenRelExeUtil.cpp
index 9e70bc5..2987075 100644
--- a/core/sql/generator/GenRelExeUtil.cpp
+++ b/core/sql/generator/GenRelExeUtil.cpp
@@ -4431,7 +4431,7 @@ short ExeUtilLobUpdate::codeGen(Generator * generator)
   }
  
   exe_util_lobupdate_tdb->setTotalBufSize(CmpCommon::getDefaultNumeric(LOB_MAX_CHUNK_MEM_SIZE));
-  exe_util_lobupdate_tdb->setLobMaxSize( CmpCommon::getDefaultNumeric(LOB_MAX_SIZE));
+  exe_util_lobupdate_tdb->setLobMaxSize( CmpCommon::getDefaultNumeric(LOB_MAX_SIZE) * 1024 * 1024);
   exe_util_lobupdate_tdb->setLobMaxChunkSize(CmpCommon::getDefaultNumeric(LOB_MAX_CHUNK_MEM_SIZE));
   exe_util_lobupdate_tdb->setLobGCLimit(CmpCommon::getDefaultNumeric(LOB_GC_LIMIT_SIZE));
                                            

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/da024aa5/core/sql/optimizer/ItemFunc.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemFunc.h b/core/sql/optimizer/ItemFunc.h
index 78b8452..eaf9a1c 100644
--- a/core/sql/optimizer/ItemFunc.h
+++ b/core/sql/optimizer/ItemFunc.h
@@ -2869,7 +2869,7 @@ public:
    obj_(obj),
    lobNum_(-1),
    lobStorageType_(Lob_Invalid_Storage),
-   lobMaxSize_(CmpCommon::getDefaultNumeric(LOB_MAX_SIZE)),
+   lobMaxSize_((Int64)CmpCommon::getDefaultNumeric(LOB_MAX_SIZE) * 1024 * 1024),
      lobMaxChunkMemSize_(CmpCommon::getDefaultNumeric(LOB_MAX_CHUNK_MEM_SIZE)),
      lobGCLimit_(CmpCommon::getDefaultNumeric(LOB_GC_LIMIT_SIZE)),
      hdfsPort_((Lng32)CmpCommon::getDefaultNumeric(LOB_HDFS_PORT)),
@@ -2910,9 +2910,9 @@ public:
   short &lobNum() {return lobNum_; }
   LobsStorage &lobStorageType() { return lobStorageType_; }
   NAString &lobStorageLocation() { return lobStorageLocation_; }
-  Int64 getLobMaxSize() {return lobMaxSize_*1024*1024; }
+  Int64 getLobMaxSize() {return lobMaxSize_; }
   Int64 getLobMaxChunkMemSize() { return lobMaxChunkMemSize_*1024*1024;}
-  Int64 getLobGCLimit() { return lobGCLimit_*1025*1024;}
+  Int64 getLobGCLimit() { return lobGCLimit_*1024*1024;}
   Int32 getLobHdfsPort() { return hdfsPort_;}
   NAString &getLobHdfsServer(){return hdfsServer_;}
  protected:


[2/2] incubator-trafodion git commit: Merge remote branch 'origin/pr/1020/head' into merge_1020

Posted by sa...@apache.org.
Merge remote branch 'origin/pr/1020/head' into merge_1020


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

Branch: refs/heads/master
Commit: 0d42cb6d86a01b14312fbc010cfe4e1d462a1013
Parents: f7e27c5 da024aa
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Wed Mar 22 17:28:58 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Wed Mar 22 17:28:58 2017 +0000

----------------------------------------------------------------------
 core/sql/generator/GenRelExeUtil.cpp | 2 +-
 core/sql/optimizer/ItemFunc.h        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------