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/10/20 06:15:25 UTC
[1/5] incubator-trafodion git commit: Fix for AQR for missing hive
tables and misc lob related fixes TRAFODION-2770
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 5071a2088 -> c7199d5aa
Fix for AQR for missing hive tables and misc lob related fixes TRAFODION-2770
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/17ba6b8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/17ba6b8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/17ba6b8a
Branch: refs/heads/master
Commit: 17ba6b8acb69a3feb3cfd3c67ae6abc37d30b242
Parents: f49b86f
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Mon Oct 16 17:54:18 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Mon Oct 16 17:54:18 2017 +0000
----------------------------------------------------------------------
core/sql/cli/SessionDefaults.cpp | 2 +-
core/sql/cli/Statement.cpp | 19 ++++++++---
core/sql/executor/ExExeUtilLoad.cpp | 3 +-
core/sql/executor/ExHdfsScan.cpp | 10 ++++--
core/sql/exp/ExpLOBaccess.cpp | 21 ++++++++++--
core/sql/optimizer/ItemFunc.h | 2 +-
core/sql/regress/hive/DIFF003.KNOWN | 56 +++++++++++++++++++++++++++-----
core/sql/regress/hive/FILTER005 | 2 ++
8 files changed, 96 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/17ba6b8a/core/sql/cli/SessionDefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/SessionDefaults.cpp b/core/sql/cli/SessionDefaults.cpp
index 25dd67c..966ce77 100644
--- a/core/sql/cli/SessionDefaults.cpp
+++ b/core/sql/cli/SessionDefaults.cpp
@@ -824,7 +824,7 @@ static const AQRInfo::AQRErrorMap aqrErrorMap[] =
AQREntry( 8575, 0, 1, 0, 1, 0, "", 0, 0),
// table not found
- AQREntry( 8577, 0, 1, 0, 1, 0, "", 0, 0),
+ AQREntry( 8577, 0, 1, 0, 1, 2, "04:05", 0, 0),
// sim check failure
AQREntry( 8579, 0, 1, 0, 1, 0, "", 0, 0),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/17ba6b8a/core/sql/cli/Statement.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Statement.cpp b/core/sql/cli/Statement.cpp
index 2169373..52f7e5a 100644
--- a/core/sql/cli/Statement.cpp
+++ b/core/sql/cli/Statement.cpp
@@ -2051,11 +2051,22 @@ RETCODE Statement::doHiveTableSimCheck(TrafSimilarityTableInfo *si,
<< DgString2(getLobErrStr(intParam1))
<< DgInt0(intParam1)
<< DgInt1(0);
-
- if (intParam1 == LOB_DATA_FILE_NOT_FOUND_ERROR)
+ if (intParam1 == LOB_DATA_READ_ERROR)
{
- diagsArea << DgSqlCode(-EXE_TABLE_NOT_FOUND)
- << DgString0(si->tableName());
+ if ((failedLocBufLen > 0) && (strlen(failedLocBuf) > 0))
+ {
+ char errBuf[strlen(si->tableName()) + 100 + failedLocBufLen];
+ str_sprintf(errBuf, "%s (fileLoc: %s)",
+ si->tableName(), failedLocBuf);
+ diagsArea << DgSqlCode(-EXE_TABLE_NOT_FOUND)
+ << DgString0(errBuf);
+ }
+ else
+ {
+ diagsArea << DgSqlCode(-EXE_TABLE_NOT_FOUND)
+ << DgString0(si->tableName());
+ }
+ simCheckFailed = TRUE;
}
return ERROR;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/17ba6b8a/core/sql/executor/ExExeUtilLoad.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilLoad.cpp b/core/sql/executor/ExExeUtilLoad.cpp
index 57345bf..a945556 100644
--- a/core/sql/executor/ExExeUtilLoad.cpp
+++ b/core/sql/executor/ExExeUtilLoad.cpp
@@ -2758,7 +2758,8 @@ void ExExeUtilLobExtractTcb::freeResources()
getGlobals()->castToExExeStmtGlobals()->castToExMasterStmtGlobals()->
getStatement()->getContext();
//close any open cursors.
- retcode = ExpLOBInterfaceSelectCursor
+ if (lobHandle_ and lobName_)
+ retcode = ExpLOBInterfaceSelectCursor
(lobGlobs,
lobName_,
lobLoc_,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/17ba6b8a/core/sql/executor/ExHdfsScan.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExHdfsScan.cpp b/core/sql/executor/ExHdfsScan.cpp
index 3b9baa5..00a673a 100644
--- a/core/sql/executor/ExHdfsScan.cpp
+++ b/core/sql/executor/ExHdfsScan.cpp
@@ -619,10 +619,16 @@ ExWorkProcRetcode ExHdfsScanTcb::work()
{
ComDiagsArea * diagsArea = NULL;
if (hdfsErrorDetail == ENOENT)
- ExRaiseSqlError(getHeap(), &diagsArea,
+ {
+ char errBuf[strlen(hdfsScanTdb().tableName()) +
+ strlen(hdfsFileName_) + 100];
+ str_sprintf(errBuf, "%s (fileLoc: %s)",
+ hdfsScanTdb().tableName(), hdfsFileName_);
+ ExRaiseSqlError(getHeap(), &diagsArea,
(ExeErrorCode)(EXE_TABLE_NOT_FOUND), NULL,
NULL, NULL, NULL,
- hdfsScanTdb().tableName());
+ errBuf);
+ }
else
ExRaiseSqlError(getHeap(), &diagsArea,
(ExeErrorCode)(EXE_HIVE_DATA_MOD_CHECK_ERROR));
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/17ba6b8a/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.cpp b/core/sql/exp/ExpLOBaccess.cpp
index 455fec1..6eced07 100644
--- a/core/sql/exp/ExpLOBaccess.cpp
+++ b/core/sql/exp/ExpLOBaccess.cpp
@@ -451,8 +451,25 @@ Ex_Lob_Error ExLob::dataModCheck(
// find mod time of root dir
hdfsFileInfo *fileInfos = hdfsGetPathInfo(fs_, dirPath);
if (fileInfos == NULL)
- {
- return LOB_DATA_FILE_NOT_FOUND_ERROR;
+ {
+ Lng32 failedFileLen = strlen(dirPath);
+ Lng32 copyLen = (failedFileLen > (*failedLocBufLen-1)
+ ? (*failedLocBufLen-1) : failedFileLen);
+ Int32 hdfserror = errno;
+ char hdfsErrStr[20];
+ sprintf(hdfsErrStr,"(errno %d)",errno);
+ str_cpy_and_null(failedLocBuf, dirPath, copyLen,
+ '\0', ' ', TRUE);
+ str_cat_c(failedLocBuf,hdfsErrStr);
+ *failedLocBufLen = copyLen;
+ if (errno)
+ {
+ // Allow for hdfs error. AQR will find the new hive mapped files
+ // if the hive table has been remapped to new data files
+ return LOB_DATA_FILE_NOT_FOUND_ERROR;
+ }
+ else
+ return LOB_DATA_READ_ERROR;
}
Int64 currModTS = fileInfos[0].mLastMod;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/17ba6b8a/core/sql/optimizer/ItemFunc.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemFunc.h b/core/sql/optimizer/ItemFunc.h
index e4bdf07..c60447d 100644
--- a/core/sql/optimizer/ItemFunc.h
+++ b/core/sql/optimizer/ItemFunc.h
@@ -2921,7 +2921,7 @@ public:
short lobNum_;
LobsStorage lobStorageType_;
NAString lobStorageLocation_;
- Int32 lobMaxSize_; // In MB units
+ Int64 lobMaxSize_; // In byte units
Int32 lobMaxChunkMemSize_; //In MB Units
Int32 lobGCLimit_ ;//In MB Units
Int32 hdfsPort_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/17ba6b8a/core/sql/regress/hive/DIFF003.KNOWN
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/DIFF003.KNOWN b/core/sql/regress/hive/DIFF003.KNOWN
index 3480a0d..f8803ea 100644
--- a/core/sql/regress/hive/DIFF003.KNOWN
+++ b/core/sql/regress/hive/DIFF003.KNOWN
@@ -1,10 +1,50 @@
-192,195d191
-< *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry.
+543,546d542
+< *** WARNING[6008] Statistics for column (SS_SOLD_DATE_SK) from table HIVE.HIVE.STORE_SALES were not available. As a result, the access path chosen might not be the best possible.
<
-< *** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: removed
+< *** WARNING[6008] Statistics for column (SS_STORE_SK) from table HIVE.HIVE.STORE_SALES were not available. As a result, the access path chosen might not be the best possible.
<
-216a213,216
-> *** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry.
->
-> *** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: removed
->
+555,560c551,557
+< 6 . 7 root 2.92E+006
+< 5 . 6 esp_exchange 1:2(hash2) 2.92E+006
+< 3 . 5 hive_insert INS_STORE_SALES_SUMM 2.92E+006
+< 2 . 3 hash_groupby 2.92E+006
+< 1 . 2 esp_exchange 2(hash2):2(hash2) 2.92E+006
+< . . 1 hive_scan STORE_SALES 2.92E+006
+---
+> 7 . 8 root 1.09E+004
+> 6 . 7 esp_exchange 1:2(hash2) 1.09E+004
+> 4 . 6 hive_insert INS_STORE_SALES_SUMM 1.09E+004
+> 3 . 4 hash_partial_groupby 1.09E+004
+> 2 . 3 esp_exchange 2(hash2):2(hash2) 1.09E+004
+> 1 . 2 hash_partial_groupby 1.09E+004
+> . . 1 hive_scan STORE_SALES 2.75E+006
+597,601c594
+< 3,10c3,4
+< < *** WARNING[6008] Statistics for column (SS_SOLD_DATE_SK) from table HIVE.HIVE.STORE_SALES were not available. As a result, the access path chosen might not be the best possible.
+< <
+< < *** WARNING[6008] Statistics for column (SS_STORE_SK) from table HIVE.HIVE.STORE_SALES were not available. As a result, the access path chosen might not be the best possible.
+< <
+---
+> 3,6c3,4
+615,618d607
+< *** WARNING[6008] Statistics for column (SS_SOLD_DATE_SK) from table HIVE.HIVE.STORE_SALES were not available. As a result, the access path chosen might not be the best possible.
+<
+< *** WARNING[6008] Statistics for column (SS_STORE_SK) from table HIVE.HIVE.STORE_SALES were not available. As a result, the access path chosen might not be the best possible.
+<
+627,633c616,623
+< 8 . 9 root 2.92E+006
+< 1 7 8 blocked_union 2.92E+006
+< 6 . 7 esp_exchange 1:2(hash2) 2.92E+006
+< 4 . 6 hive_insert INS_STORE_SALES_SUMM 2.92E+006
+< 3 . 4 hash_groupby 2.92E+006
+< 2 . 3 esp_exchange 2(hash2):2(hash2) 2.92E+006
+< . . 2 hive_scan STORE_SALES 2.92E+006
+---
+> 9 . 10 root 1.09E+004
+> 1 8 9 blocked_union 1.09E+004
+> 7 . 8 esp_exchange 1:2(hash2) 1.09E+004
+> 5 . 7 hive_insert INS_STORE_SALES_SUMM 1.09E+004
+> 4 . 5 hash_partial_groupby 1.09E+004
+> 3 . 4 esp_exchange 2(hash2):2(hash2) 1.09E+004
+> 2 . 3 hash_partial_groupby 1.09E+004
+> . . 2 hive_scan STORE_SALES 2.75E+006
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/17ba6b8a/core/sql/regress/hive/FILTER005
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/FILTER005 b/core/sql/regress/hive/FILTER005
index b128157..08be9a6 100755
--- a/core/sql/regress/hive/FILTER005
+++ b/core/sql/regress/hive/FILTER005
@@ -31,4 +31,6 @@ sed "
s/Logging Location: \/user\/trafodion\/bulkload\/logs\/ERR.*/Logging Location:@loggingLocation@/
s/Logging Location: \/user\/trafodion\/bulkload\/logs\/TEST005\/ERR.*/Logging Location:@TEST005LoggingLocation@/
s/Time:.*/Time:@time@/
+s/^\*\*\* WARNING\[8436\].*/Warning 8436 or 8577 removed/g
+s/^\*\*\* WARNING\[8577\].*/Warning 8436 or 8577 removed/g
" $fil
[5/5] incubator-trafodion git commit: Merge remote branch
'origin/pr/1271/head' into merge_1271
Posted by sa...@apache.org.
Merge remote branch 'origin/pr/1271/head' into merge_1271
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c7199d5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c7199d5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c7199d5a
Branch: refs/heads/master
Commit: c7199d5aa9446745caef2a6f76ca46b153312b3e
Parents: 5071a20 5889cba
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Fri Oct 20 06:14:55 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Fri Oct 20 06:14:55 2017 +0000
----------------------------------------------------------------------
core/sql/cli/SessionDefaults.cpp | 2 +-
core/sql/cli/Statement.cpp | 26 +++++++++++----
core/sql/executor/ExExeUtilLoad.cpp | 3 +-
core/sql/executor/ExHdfsScan.cpp | 10 ++++--
core/sql/exp/ExpLOBaccess.cpp | 21 ++++++++++--
core/sql/optimizer/ItemFunc.h | 2 +-
core/sql/regress/hive/DIFF003.KNOWN | 56 +++++++++++++++++++++++++++-----
core/sql/regress/hive/EXPECTED007 | 28 ++++++++--------
core/sql/regress/hive/FILTER005 | 2 ++
9 files changed, 115 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
[3/5] incubator-trafodion git commit: Fixes to datamodcheck
Posted by sa...@apache.org.
Fixes to datamodcheck
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/68e83294
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/68e83294
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/68e83294
Branch: refs/heads/master
Commit: 68e8329428bf5e27c0eb0cdc33bf6a56748a9310
Parents: c47e38b
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Thu Oct 19 07:11:03 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Thu Oct 19 07:11:03 2017 +0000
----------------------------------------------------------------------
core/sql/exp/ExpLOBaccess.cpp | 2 +-
core/sql/regress/hive/EXPECTED007 | 28 ++++++++++++++--------------
2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/68e83294/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.cpp b/core/sql/exp/ExpLOBaccess.cpp
index 299f96e..13137d4 100644
--- a/core/sql/exp/ExpLOBaccess.cpp
+++ b/core/sql/exp/ExpLOBaccess.cpp
@@ -466,7 +466,7 @@ Ex_Lob_Error ExLob::dataModCheck(
{
// Allow for hdfs error. AQR will find the new hive mapped files
// if the hive table has been remapped to new data files
- return LOB_DATA_FILE_NOT_FOUND_ERROR;
+ return LOB_DATA_MOD_CHECK_ERROR;
}
else
return LOB_DATA_READ_ERROR;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/68e83294/core/sql/regress/hive/EXPECTED007
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED007 b/core/sql/regress/hive/EXPECTED007
index 651556d..5bc2c3a 100644
--- a/core/sql/regress/hive/EXPECTED007
+++ b/core/sql/regress/hive/EXPECTED007
@@ -48,7 +48,7 @@ CREATE TABLE THIVE1
;
REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.THIVE1;
-/* ObjectUID = 7486236896221741445 */
+/* ObjectUID = 7080927501909560103 */
--- SQL operation complete.
>>
@@ -80,7 +80,7 @@ REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.THIVE1;
>>invoke trafodion.sch007.vhivehbase;
-- Definition of Trafodion view TRAFODION.SCH007.VHIVEHBASE
--- Definition current Wed May 3 05:10:02 2017
+-- Definition current Wed Oct 18 21:01:16 2017
(
AA INT DEFAULT NULL
@@ -258,7 +258,7 @@ CREATE TABLE THIVE2
;
REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.THIVE2;
-/* ObjectUID = 7486236896221741067 */
+/* ObjectUID = 1928809434068290686 */
--- SQL operation complete.
>>showddl trafodion.sch007.vhive3;
@@ -411,7 +411,7 @@ A B
>>invoke hive.hivesch007.vhive1;
-- Definition of native Hive view VHIVE1
--- Definition current Wed May 3 05:11:22 2017
+-- Definition current Wed Oct 18 21:03:26 2017
(
A INT
@@ -453,7 +453,7 @@ A
>>invoke hive.hivesch007.vhive11;
-- Definition of native Hive view VHIVE11
--- Definition current Wed May 3 05:11:24 2017
+-- Definition current Wed Oct 18 21:03:30 2017
(
A INT
@@ -669,7 +669,7 @@ CREATE VIEW vhive11 AS
select vhive1.a from hivesch007.vhive1 where vhive1.a > 0 ;
REGISTER HIVE VIEW HIVE.HIVESCH007.VHIVE11;
-/* ObjectUID = 7463718898080907566 */
+/* ObjectUID = 6918234965366828184 */
--- SQL operation complete.
>>get tables in view hive.hivesch007.vhive11;
@@ -952,7 +952,7 @@ create database hivesch0078;
*** WARNING[8597] Statement was automatically retried 1 time(s). Delay before each retry was 0 seconds. See next entry for the error that caused this retry.
-*** WARNING[8577] Table, index, or view HIVE.HIVESCH007.THIVE1 was not found.
+*** WARNING[8436] Mismatch detected between compiletime and runtime hive table definitions. DataModMismatchDetails: compiledModTS = 1508360788, failedModTS = -1, failedLoc = hdfs://localhost:25600/user/hive/warehouse/hivesch007.db/thive1
--- 0 row(s) selected.
>>
@@ -1015,11 +1015,11 @@ S------ HIVE.HIVESCH007.THIVE9
>>showstats for table hive.hivesch007.thive9 on every column;
Histogram data for Table HIVE.HIVESCH007.THIVE9
-Table ID: 7463718898080914461
+Table ID: 6918234965366838662
Hist ID # Ints Rowcount UEC Colname(s)
========== ====== =========== =========== ===========================
- 770517434 6 6 6 A
+ 332052322 6 6 6 A
--- SQL operation complete.
@@ -1058,7 +1058,7 @@ CREATE TABLE THIVE9
;
REGISTER HIVE TABLE HIVE.HIVESCH007.THIVE9;
-/* ObjectUID = 7463718898080914461 */
+/* ObjectUID = 6918234965366838662 */
/* Trafodion DDL */
@@ -1070,11 +1070,11 @@ CREATE EXTERNAL TABLE THIVE9
>>showstats for table hive.hivesch007.thive9 on every column;
Histogram data for Table HIVE.HIVESCH007.THIVE9
-Table ID: 7463718898080914461
+Table ID: 6918234965366838662
Hist ID # Ints Rowcount UEC Colname(s)
========== ====== =========== =========== ===========================
- 770517434 6 6 6 A
+ 332052322 6 6 6 A
--- SQL operation complete.
@@ -1101,11 +1101,11 @@ CREATE EXTERNAL TABLE THIVE9
>>showstats for table hive.hivesch007.thive9 on every column;
Histogram data for Table HIVE.HIVESCH007.THIVE9
-Table ID: 7463718898080914461
+Table ID: 6918234965366838662
Hist ID # Ints Rowcount UEC Colname(s)
========== ====== =========== =========== ===========================
- 770517434 6 6 6 A
+ 332052322 6 6 6 A
--- SQL operation complete.
[4/5] incubator-trafodion git commit: change str_sprintf to snprintf
Posted by sa...@apache.org.
change str_sprintf to snprintf
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5889cba4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5889cba4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5889cba4
Branch: refs/heads/master
Commit: 5889cba42707e1115d30f5d4bb0cb65ed9f8d073
Parents: 68e8329
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Thu Oct 19 21:21:24 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Thu Oct 19 21:21:24 2017 +0000
----------------------------------------------------------------------
core/sql/cli/Statement.cpp | 11 +++++++----
core/sql/executor/ExHdfsScan.cpp | 4 ++--
core/sql/exp/ExpLOBaccess.cpp | 2 +-
3 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5889cba4/core/sql/cli/Statement.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Statement.cpp b/core/sql/cli/Statement.cpp
index adbacc8..6d847f0 100644
--- a/core/sql/cli/Statement.cpp
+++ b/core/sql/cli/Statement.cpp
@@ -2056,8 +2056,7 @@ RETCODE Statement::doHiveTableSimCheck(TrafSimilarityTableInfo *si,
if ((failedLocBufLen > 0) && (strlen(failedLocBuf) > 0))
{
char errBuf[strlen(si->tableName()) + 100 + failedLocBufLen];
- str_sprintf(errBuf, "%s (fileLoc: %s)",
- si->tableName(), failedLocBuf);
+ snprintf(errBuf,sizeof(errBuf), "%s (fileLoc: %s)", si->tableName(), failedLocBuf);
diagsArea << DgSqlCode(-EXE_TABLE_NOT_FOUND)
<< DgString0(errBuf);
}
@@ -2075,9 +2074,13 @@ RETCODE Statement::doHiveTableSimCheck(TrafSimilarityTableInfo *si,
if (retcode == 1) // check failed
{
char errStr[2000];
- str_sprintf(errStr, "compiledModTS = %ld, failedModTS = %ld, failedLoc = %s",
+ /* str_sprintf(errStr, "compiledModTS = %ld, failedModTS = %ld, failedLoc = %s",
si->modTS(), failedModTS,
- (failedLocBufLen > 0 ? failedLocBuf : si->hdfsRootDir()));
+ (failedLocBufLen > 0 ? failedLocBuf : si->hdfsRootDir()));*/
+ snprintf(errStr,sizeof(errStr),
+ "compiledModTS = %ld, failedModTS = %ld, failedLoc = %s",
+ si->modTS(), failedModTS,
+ (failedLocBufLen > 0 ? failedLocBuf : si->hdfsRootDir()));
diagsArea << DgSqlCode(-EXE_HIVE_DATA_MOD_CHECK_ERROR)
<< DgString0(errStr);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5889cba4/core/sql/executor/ExHdfsScan.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExHdfsScan.cpp b/core/sql/executor/ExHdfsScan.cpp
index 8bef800..f49ad06 100644
--- a/core/sql/executor/ExHdfsScan.cpp
+++ b/core/sql/executor/ExHdfsScan.cpp
@@ -622,8 +622,8 @@ ExWorkProcRetcode ExHdfsScanTcb::work()
{
char errBuf[strlen(hdfsScanTdb().tableName()) +
strlen(hdfsFileName_) + 100];
- str_sprintf(errBuf, "%s (fileLoc: %s)",
- hdfsScanTdb().tableName(), hdfsFileName_);
+ snprintf(errBuf, sizeof(errBuf),"%s (fileLoc: %s)",
+ hdfsScanTdb().tableName(), hdfsFileName_);
ExRaiseSqlError(getHeap(), &diagsArea,
(ExeErrorCode)(EXE_TABLE_NOT_FOUND), NULL,
NULL, NULL, NULL,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5889cba4/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBaccess.cpp b/core/sql/exp/ExpLOBaccess.cpp
index 13137d4..58febe9 100644
--- a/core/sql/exp/ExpLOBaccess.cpp
+++ b/core/sql/exp/ExpLOBaccess.cpp
@@ -457,7 +457,7 @@ Ex_Lob_Error ExLob::dataModCheck(
? (*failedLocBufLen-1) : failedFileLen);
Int32 hdfserror = errno;
char hdfsErrStr[20];
- sprintf(hdfsErrStr,"(errno %d)",errno);
+ snprintf(hdfsErrStr,sizeof(hdfsErrStr),"(errno %d)",errno);
str_cpy_and_null(failedLocBuf, dirPath, copyLen,
'\0', ' ', TRUE);
str_cat_c(failedLocBuf,hdfsErrStr);
[2/5] incubator-trafodion git commit: Merge remote branch
'origin/master' into traf_misc
Posted by sa...@apache.org.
Merge remote branch 'origin/master' into traf_misc
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c47e38b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c47e38b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c47e38b8
Branch: refs/heads/master
Commit: c47e38b85270043a20c67dbf5f34f007ed6d0f21
Parents: 17ba6b8 e8bdaba
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Mon Oct 16 17:56:46 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Mon Oct 16 17:56:46 2017 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/Debug.cpp | 64 +-
core/sqf/sql/scripts/install_traf_components | 2 +-
core/sqf/sql/scripts/testMdam.py | 412 +++++
core/sqf/src/tm/tm.cpp | 6 +-
core/sql/bin/SqlEsp_templ.cpp | 85 --
core/sql/bin/SqlciErrors.txt | 3 +
core/sql/bin/Sqlci_templ.cpp | 132 --
core/sql/bin/arkcmp.cpp | 3 -
core/sql/bin/ex_esp_main.cpp | 7 -
core/sql/cli/Cli.cpp | 22 +-
core/sql/cli/Cli.h | 2 +-
core/sql/cli/CliExpExchange.cpp | 25 +-
core/sql/cli/CliExtern.cpp | 236 +--
core/sql/cli/Context.cpp | 7 +-
core/sql/cli/Descriptor.cpp | 2 +-
core/sql/cli/Statement.cpp | 8 +-
core/sql/cli/Statement.h | 3 +-
core/sql/cli/sqlcli.h | 3 -
core/sql/clitest/blobtest.cpp | 2 +-
core/sql/comexe/CmpMessage.cpp | 6 +-
core/sql/comexe/ComTdbRoot.cpp | 2 +-
core/sql/comexe/ComTdbSendTop.cpp | 2 +-
core/sql/comexe/ComTdbSort.cpp | 4 +-
core/sql/comexe/ComTdbSort.h | 21 +-
core/sql/comexe/ComTdbStoredProc.cpp | 2 +-
core/sql/comexe/ComTdbUdr.cpp | 4 +-
core/sql/comexe/ExplainTuple.cpp | 2 +-
core/sql/comexe/FragDir.cpp | 2 +-
core/sql/comexe/LateBindInfo.cpp | 2 +-
core/sql/comexe/PartInputDataDesc.cpp | 2 +-
core/sql/common/BloomFilter.cpp | 2 +-
core/sql/common/Collections.cpp | 10 +-
core/sql/common/Collections.h | 11 +-
core/sql/common/ComUser.cpp | 1 -
core/sql/common/DateTimeType.cpp | 5 +-
core/sql/common/Ipc.cpp | 72 +-
core/sql/common/Ipc.h | 15 -
core/sql/common/IpcGuardian.cpp | 3 -
core/sql/common/NAIpc.cpp | 2 -
core/sql/common/Platform.h | 229 +--
core/sql/common/SharedPtr.h | 8 +-
core/sql/common/arkcmp_proc.cpp | 3 -
core/sql/common/charinfo.cpp | 11 +-
core/sql/common/ipcmsg.cpp | 3 -
core/sql/common/ipcmsg.h | 2 +-
core/sql/common/str.cpp | 12 +-
core/sql/common/swscanf.cpp | 2 +-
core/sql/executor/BufferList.cpp | 18 +-
core/sql/executor/BufferReference.cpp | 4 +-
core/sql/executor/ExDupSqlBuffer.cpp | 13 -
core/sql/executor/ExExeUtil.h | 2 +-
core/sql/executor/ExExeUtilCommon.cpp | 2 +-
core/sql/executor/ExExeUtilGet.cpp | 2 +-
core/sql/executor/ExExeUtilLoad.cpp | 34 +-
core/sql/executor/ExExeUtilMisc.cpp | 4 +-
core/sql/executor/ExExplain.cpp | 2 +-
core/sql/executor/ExFastTransport.cpp | 4 +-
core/sql/executor/ExFastTransport.h | 2 +-
core/sql/executor/ExHbaseAccess.cpp | 4 +-
core/sql/executor/ExHdfsScan.cpp | 4 +-
core/sql/executor/ExHdfsScan.h | 2 +-
core/sql/executor/ExSMEvent.cpp | 4 +-
core/sql/executor/ExSMTaskList.cpp | 2 +-
core/sql/executor/ExStats.cpp | 2 +-
core/sql/executor/ExUdr.cpp | 5 +-
core/sql/executor/ExUdrServer.cpp | 2 +-
core/sql/executor/HBaseClient_JNI.cpp | 6 +-
core/sql/executor/SwapSpace.cpp | 12 -
core/sql/executor/cluster.cpp | 2 +-
core/sql/executor/ex_exe_stmt_globals.cpp | 8 -
core/sql/executor/ex_frag_rt.cpp | 3 -
core/sql/executor/ex_globals.cpp | 9 +-
core/sql/executor/ex_globals.h | 6 +-
core/sql/executor/ex_mj.cpp | 35 -
core/sql/executor/ex_sort.cpp | 11 +-
core/sql/executor/hash_table.cpp | 4 +-
core/sql/executor/hiveHook.cpp | 4 +-
core/sql/exp/ExpAtp.cpp | 2 +-
core/sql/exp/ExpConvMxcs.cpp | 2 +-
core/sql/exp/ExpCriDesc.cpp | 2 +-
core/sql/exp/ExpHbaseInterface.cpp | 6 +-
core/sql/exp/ExpLOB.cpp | 28 +-
core/sql/exp/ExpLOB.h | 21 +-
core/sql/exp/ExpLOBaccess.cpp | 6 +-
core/sql/exp/ExpLOBaccess.h | 2 +-
core/sql/exp/ExpLOBinterface.cpp | 42 +-
core/sql/exp/ExpLOBinterface.h | 40 +-
core/sql/exp/ExpPCode.cpp | 2 +-
core/sql/exp/ExpPCodeOptimizations.cpp | 2 +-
core/sql/exp/ExpPCodeOptimizations.h | 2 +-
core/sql/exp/ExpPCodeOptsNativeExpr.cpp | 4 +-
core/sql/exp/ExpPackDefs.cpp | 2 +-
core/sql/exp/exp_bignum.cpp | 2 +-
core/sql/exp/exp_clause.cpp | 2 +-
core/sql/exp/exp_conv.cpp | 20 +-
core/sql/exp/exp_eval.cpp | 8 +-
core/sql/exp/exp_expr.h | 18 +-
core/sql/exp/exp_function.cpp | 16 +-
core/sql/export/NAVersionedObject.h | 12 +-
core/sql/generator/GenExpGenerator.cpp | 8 +-
core/sql/generator/GenExplain.cpp | 3 +
core/sql/generator/GenPreCode.cpp | 19 +-
core/sql/generator/GenRelMisc.cpp | 5 -
core/sql/generator/GenRelPackedRows.cpp | 16 +
core/sql/generator/GenRelScan.cpp | 32 +-
core/sql/generator/GenRelUpdate.cpp | 210 ++-
core/sql/generator/GenUdr.cpp | 3 +-
core/sql/langman/LmResultSetJava.cpp | 2 +-
core/sql/nskgmake/Makerules.linux | 2 +
core/sql/nskgmake/arkcmp/Makefile | 3 +-
core/sql/nskgmake/arkcmp_dll/Makefile | 5 +-
core/sql/optimizer/BindItemExpr.cpp | 8 +-
core/sql/optimizer/BindRelExpr.cpp | 80 +-
core/sql/optimizer/ClusteredBitmap.cpp | 2 +-
core/sql/optimizer/CompilerTracking.cpp | 4 +-
core/sql/optimizer/EstLogProp.h | 1 +
core/sql/optimizer/HDFSHook.h | 1 +
core/sql/optimizer/Inlining.cpp | 104 --
core/sql/optimizer/ItemExpr.cpp | 2 +-
core/sql/optimizer/NAColumn.cpp | 14 -
core/sql/optimizer/NAColumn.h | 1 -
core/sql/optimizer/NATable.cpp | 5 +-
core/sql/optimizer/OptLogRelExpr.cpp | 10 +-
core/sql/optimizer/OptRange.cpp | 2 +-
core/sql/optimizer/OptimizerSimulator.cpp | 12 +-
core/sql/optimizer/RelExpr.cpp | 32 +-
core/sql/optimizer/RelScan.h | 5 +-
core/sql/optimizer/RelUpdate.h | 4 -
core/sql/optimizer/ScanOptimizer.cpp | 1442 +++++++++++++++++-
core/sql/optimizer/ScanOptimizer.h | 31 +
core/sql/optimizer/ScmCostMethod.cpp | 3 +-
core/sql/optimizer/SimpleScanOptimizer.h | 13 +-
core/sql/optimizer/SynthType.cpp | 3 +-
core/sql/optimizer/TransRule.cpp | 7 +
core/sql/optimizer/UdfDllInteraction.cpp | 4 +-
core/sql/optimizer/ValueDesc.h | 2 +
core/sql/parser/SqlParserAux.cpp | 2 +-
core/sql/parser/StmtDDLCreate.cpp | 4 +-
core/sql/parser/sqlparser.y | 120 +-
core/sql/parser/ulexer.h | 5 -
core/sql/regress/core/EXPECTED005.SB | 7 +-
core/sql/regress/executor/EXPECTED015.SB | 150 ++
core/sql/regress/executor/TEST015 | 62 +
core/sql/regress/tools/logsort_src/line.c | 26 +-
core/sql/regress/tools/logsort_src/line.h | 1 +
core/sql/regress/tools/logsort_src/logsort.c | 13 +
core/sql/regress/udr/EXPECTED001 | 24 +-
core/sql/regress/udr/EXPECTED100.SB | 21 +
core/sql/regress/udr/TEST001 | 13 +
core/sql/regress/udr/TEST001_Sessionize.java | 142 +-
core/sql/regress/udr/TEST100 | 9 +
core/sql/sort/Qsort.cpp | 4 +-
core/sql/sort/RunDirectory.cpp | 4 +-
core/sql/sort/ScratchFileConnection.h | 2 +-
core/sql/sort/ScratchFileMap.cpp | 8 +-
core/sql/sort/ScratchSpace.cpp | 106 +-
core/sql/sort/SortUtil.cpp | 32 +-
core/sql/sort/SortUtilCfg.cpp | 2 +-
core/sql/sort/TreeNode.cpp | 4 +-
core/sql/sort/diskpool_sq.cpp | 4 +-
core/sql/sort/scratchfile_base.cpp | 4 +-
core/sql/sqlci/sqlci_lex.ll | 8 -
core/sql/sqlcomp/CmpDescribe.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 9 +-
core/sql/sqlcomp/CmpSeabaseDDLauth.h | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 5 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 32 +-
core/sql/sqlcomp/CmpSeabaseDDLindex.cpp | 16 +-
core/sql/sqlcomp/CmpSeabaseDDLmd.h | 155 +-
core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLrepos.h | 48 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 20 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.h | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 24 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 78 +-
core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp | 4 +-
core/sql/sqlcomp/CmpSeabaseDDLupgrade.h | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 4 +-
core/sql/sqlcomp/DefaultConstants.h | 11 +-
core/sql/sqlcomp/PrivMgr.cpp | 2 +-
core/sql/sqlcomp/PrivMgrCommands.cpp | 2 +-
core/sql/sqlcomp/PrivMgrCommands.h | 2 +-
core/sql/sqlcomp/PrivMgrComponentOperations.cpp | 6 +-
core/sql/sqlcomp/PrivMgrComponentPrivileges.cpp | 6 +-
core/sql/sqlcomp/PrivMgrMD.cpp | 18 +-
core/sql/sqlcomp/PrivMgrMDTable.cpp | 10 +-
core/sql/sqlcomp/PrivMgrObjects.cpp | 2 +-
core/sql/sqlcomp/PrivMgrPrivileges.cpp | 14 +-
core/sql/sqlcomp/PrivMgrRoles.cpp | 2 +-
core/sql/sqlcomp/QCache.cpp | 5 +-
core/sql/sqlcomp/nadefaults.cpp | 23 +-
core/sql/udrserv/UdrStreams.cpp | 2 -
core/sql/ustat/hs_faststats.h | 6 +-
core/sql/ustat/hs_globals.cpp | 81 +-
core/sql/ustat/hs_globals.h | 6 +
core/sql/ustat/hs_read.cpp | 6 +-
core/sql/ustat/hs_update.cpp | 37 +-
core/sql/ustat/hs_util.cpp | 2 +-
docs/lob_guide/pom.xml | 8 +-
.../lob_guide/src/asciidoc/_chapters/about.adoc | 2 +-
.../asciidoc/_chapters/working_with_lob.adoc | 407 ++++-
docs/lob_guide/src/asciidoc/index.adoc | 2 +-
docs/odb_user/src/asciidoc/_chapters/load.adoc | 76 +-
docs/src/site/markdown/documentation.md | 1 +
pom.xml | 1 +
205 files changed, 4015 insertions(+), 1924 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c47e38b8/core/sql/cli/Statement.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c47e38b8/core/sql/executor/ExExeUtilLoad.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c47e38b8/core/sql/executor/ExHdfsScan.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c47e38b8/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------