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

Merge pull request #3156 from mariadb-corporation/sz-fix-oracle-mode

Browse Source 
Fixes MCOL-5700, Oracle mode test results
This commit is contained in:
mariadb-KirillPerov
2024-03-27 14:45:52 +06:00
committed by GitHub
parent 444cf4c65e 34acd3559b
commit 56b35d5cf6
9 changed files with 102 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
utils/funcexp/func_concat_oracle.cpp
View File

@ -46,25 +46,21 @@ string Func_concat_oracle::getStrVal(Row& row, FunctionParm& parm, bool& isNull,
{
string ret;
string tmp;
stringValue(parm[0], row, isNull, ret);
// Oracle Mode should replace NULL with "" unless all values are NULL
if (isNull)
{
ret = "";
isNull = false;
}
// we default to true as any non-NULL operand will reset it to false
// and all NULL operands will leave it as true, which is intended.
isNull = true;
// TODO: do a better job of cutting down the number re-allocations.
// look at Item_func_concat::realloc_result for ideas and use
// std::string:resize() appropriatly.
for (unsigned int id = 1; id < parm.size(); id++)
for (unsigned int id = 0; id < parm.size(); id++)
{
stringValue(parm[id], row, isNull, tmp);
if (isNull)
bool tempIsNull = false;
stringValue(parm[id], row, tempIsNull, tmp);
if (!tempIsNull)
{
tmp = "";
isNull = false;
ret.append(tmp);
}
ret.append(tmp);
}
return ret;

18
utils/loggingcpp/exceptclasses.h
View File

@ -263,6 +263,24 @@ class ProtocolError : public std::logic_error
#ifndef __STRING
#define __STRING(x) #x
#endif
#define idblog(x) \
do \
{ \
{ \
std::ostringstream os; \
\
os << __FILE__ << "@" << __LINE__ << ": \'" << x << "\'"; \
std::cerr << os.str() << std::endl; \
logging::MessageLog logger((logging::LoggingID())); \
logging::Message message; \
logging::Message::Args args; \
\
args.add(os.str()); \
message.format(args); \
logger.logErrorMessage(message); \
} \
} while (0)
#define idbassert(x) \
do \
{ \