trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sure...@apache.org
Subject [10/13] incubator-trafodion git commit: Misc fixes and comment cleanup
Date Fri, 25 Sep 2015 21:13:23 GMT
Misc fixes and comment cleanup


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

Branch: refs/heads/master
Commit: 203b4031001d600446e1a2d574024b6c6ec2e8b4
Parents: cff5dda
Author: Sandhya Sundaresan <sandhya@apache.org>
Authored: Tue Sep 22 18:45:01 2015 +0000
Committer: Sandhya Sundaresan <sandhya@apache.org>
Committed: Tue Sep 22 18:45:01 2015 +0000

----------------------------------------------------------------------
 core/sql/executor/ExExeUtilLoad.cpp |  2 +-
 core/sql/exp/ExpLOBaccess.cpp       |  2 --
 core/sql/exp/ExpLOBaccess.h         |  2 +-
 core/sql/optimizer/BindItemExpr.cpp |  2 --
 core/sql/parser/sqlparser.y         | 16 +---------------
 core/sql/sqlcomp/nadefaults.cpp     |  2 +-
 6 files changed, 4 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/203b4031/core/sql/executor/ExExeUtilLoad.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilLoad.cpp b/core/sql/executor/ExExeUtilLoad.cpp
index b22a1d3..4955c57 100644
--- a/core/sql/executor/ExExeUtilLoad.cpp
+++ b/core/sql/executor/ExExeUtilLoad.cpp
@@ -3575,7 +3575,7 @@ short ExExeUtilFileLoadTcb::work()
 
 	    lobType_ =  lobTdb().lobStorageType_; //(Lng32)Lob_HDFS_File;
 
-	    lobDataExtractLen_ = lobTdb().bufSize_; //100000;
+	    lobDataExtractLen_ = lobTdb().bufSize_; 
 	    
 
 	    lobData_ = new(getHeap()) char[(UInt32)lobDataExtractLen_];

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/203b4031/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.cpp b/core/sql/exp/ExpLOBaccess.cpp
index f2c5c02..b042d1f 100644
--- a/core/sql/exp/ExpLOBaccess.cpp
+++ b/core/sql/exp/ExpLOBaccess.cpp
@@ -596,8 +596,6 @@ Ex_Lob_Error ExLob::readLocalSourceFile(char *srcfile, char *&fileData,
Int32 &s
        return LOB_SOURCE_FILE_STAT_ERROR;
      }
 
-     //size = statbuf.st_size;
-
      fileData = (char *) (getLobGlobalHeap())->allocateMemory(size);
      if (fileData == (char *)-1) {
        return LOB_SOURCE_DATA_ALLOC_ERROR;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/203b4031/core/sql/exp/ExpLOBaccess.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.h b/core/sql/exp/ExpLOBaccess.h
index 52e1a6e..e68c2eb 100644
--- a/core/sql/exp/ExpLOBaccess.h
+++ b/core/sql/exp/ExpLOBaccess.h
@@ -113,7 +113,7 @@ Ex_Lob_Error ExLobsOper (
     void        *blackBox,         // black box to be sent to cli
     Int64       blackBoxLen,        // length of black box
     Int64       lobMaxSize = 0,        // max size of lob.
-    Int64       lobMaxChunkMemSize = 0 ,//mas length of intermediate mem buffer used to do
i/o.
+    Int64       lobMaxChunkMemSize = 0 ,//max length of intermediate mem buffer used to do
i/o.
     int         bufferSize =0,
     short       replication =0,
     int         blocksize=0,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/203b4031/core/sql/optimizer/BindItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindItemExpr.cpp b/core/sql/optimizer/BindItemExpr.cpp
index 259cf73..da39397 100644
--- a/core/sql/optimizer/BindItemExpr.cpp
+++ b/core/sql/optimizer/BindItemExpr.cpp
@@ -1,6 +1,4 @@
 /**********************************************************************
- * b
- *
 // @@@ START COPYRIGHT @@@
 //
 // Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/203b4031/core/sql/parser/sqlparser.y
----------------------------------------------------------------------
diff --git a/core/sql/parser/sqlparser.y b/core/sql/parser/sqlparser.y
index 67bcee1..29b9666 100755
--- a/core/sql/parser/sqlparser.y
+++ b/core/sql/parser/sqlparser.y
@@ -12700,21 +12700,7 @@ update_obj_to_lob_function :
 			        {
 				  $$ = new (PARSERHEAP()) LOBinsert( $4, $7, LOBoper::BUFFER_, TRUE);
 				}
-                          | TOK_FILETOLOB '(' literal ')'
-			        {
-                                  YYERROR;
-                                  $$ = new (PARSERHEAP()) LOBupdate( $3, NULL, LOBoper::FILE_,
FALSE);
-				}
-                          | TOK_FILETOLOB '(' literal ',' TOK_APPEND ')'
-			        {
-				  YYERROR;
-				  $$ = new (PARSERHEAP()) LOBupdate( $3, NULL, LOBoper::FILE_, TRUE);
-				}
- 			  | TOK_LOADTOLOB '(' literal ')'
-			        {
-				  YYERROR;
-                                  $$ = new (PARSERHEAP()) LOBupdate( $3, NULL, LOBoper::LOAD_,
FALSE);
-				}
+
 			  | TOK_EXTERNALTOLOB '(' literal ')'
 			        {
                                   YYERROR;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/203b4031/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp
index 75425c8..eb1d730 100644
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@ -2056,7 +2056,7 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
   DD_____(LOB_HDFS_SERVER,                 "default"), 
    
    // Size of memoryin bytes  used to perform I/O to lob data file 
-  // default size is 512MB   (1000 M) . Change to adjust memory usage. 
+  // default size is 512MB   . Change to adjust memory usage. 
   DDint__(LOB_MAX_CHUNK_MEM_SIZE,            "536870912"), 
   // default size is 10 G  (10000 M)
   DDint__(LOB_MAX_SIZE,                         "10000"),


Mime
View raw message