database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

Test for NULL before using. Used to not matter, but under MariaDB, it might be NULL.

Browse Source
This commit is contained in:
David Hall
2016-03-31 17:02:09 -05:00
parent 45f511d6c3
commit bb0f0b710c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dbcon/joblist/jlf_common.cpp
View File

@@ -56,7 +56,7 @@ uint32_t uniqTupleKey(JobInfo& jobInfo,
bool correlated=false) bool correlated=false)
{ {
uint64_t subId = jobInfo.subId; uint64_t subId = jobInfo.subId;
if (correlated) if (correlated && jobInfo.pJobInfo)
subId = jobInfo.pJobInfo->subId; subId = jobInfo.pJobInfo->subId;
string alias(ta); string alias(ta);
@@ -212,7 +212,7 @@ uint32_t getTupleKey_(const JobInfo& jobInfo,
uint64_t engine = 0) uint64_t engine = 0)
{ {
uint64_t subId = jobInfo.subId; uint64_t subId = jobInfo.subId;
if (correlated) if (correlated && jobInfo.pJobInfo)
subId = jobInfo.pJobInfo->subId; subId = jobInfo.pJobInfo->subId;
string alias(tblAlias); string alias(tblAlias);
@@ -541,7 +541,7 @@ TupleInfo setExpTupleInfo(const execplan::CalpontSystemCatalog::ColType& ct, uin
// pretend all expressions belong to "virtual" table EXPRESSION, (CNX_EXP_TABLE_ID, expression) // pretend all expressions belong to "virtual" table EXPRESSION, (CNX_EXP_TABLE_ID, expression)
// CNX_EXP_TABLE_ID(999) is not for user table or column, there will be no confilict in queries. // CNX_EXP_TABLE_ID(999) is not for user table or column, there will be no confilict in queries.
JobInfo* ji = &jobInfo; JobInfo* ji = &jobInfo;
if (cr) if (cr && jobInfo.pJobInfo)
ji = jobInfo.pJobInfo; ji = jobInfo.pJobInfo;
string expAlias("$exp"); string expAlias("$exp");
@@ -563,7 +563,7 @@ TupleInfo setExpTupleInfo(const execplan::ReturnedColumn* rc, JobInfo& jobInfo)
uint32_t getExpTupleKey(const JobInfo& jobInfo, uint64_t eid, bool cr) uint32_t getExpTupleKey(const JobInfo& jobInfo, uint64_t eid, bool cr)
{ {
const JobInfo* ji = &jobInfo; const JobInfo* ji = &jobInfo;
if (cr) if (cr && jobInfo.pJobInfo)
ji = jobInfo.pJobInfo; ji = jobInfo.pJobInfo;
string expAlias("$exp"); string expAlias("$exp");