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

One more bool* to bool cast bug (#2097)

Browse Source
This commit is contained in:
Leonid Fedorov
2021-08-18 23:56:57 +03:00
committed by GitHub
parent 98473a45cc
commit 517e793843
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
utils/udfsdk/mcsv1_udaf.h
View File

@ -87,13 +87,13 @@
namespace mcsv1sdk namespace mcsv1sdk
{ {
// The return type of the CREATE AGGREGATE statement // The return type of the CREATE AGGREGATE statement
enum enum_mariadb_return_type { enum enum_mariadb_return_type {
MYSQL_TYPE_DOUBLE = 5, MYSQL_TYPE_DOUBLE = 5,
MYSQL_TYPE_LONGLONG = 8, MYSQL_TYPE_LONGLONG = 8,
MYSQL_TYPE_VARCHAR=15, MYSQL_TYPE_VARCHAR=15,
MYSQL_TYPE_NEWDECIMAL = 246 MYSQL_TYPE_NEWDECIMAL = 246
}; };
/** /**
* A map from name to function object. * A map from name to function object.
* *
@ -363,13 +363,13 @@ public:
// Get the name of the function // Get the name of the function
EXPORT const std::string& getName() const; EXPORT const std::string& getName() const;
// Get the return type as set by CREATE AGGREGATE FUNCTION // Get the return type as set by CREATE AGGREGATE FUNCTION
EXPORT enum_mariadb_return_type getMariaDBReturnType() const; EXPORT enum_mariadb_return_type getMariaDBReturnType() const;
EXPORT mcsv1Context& operator=(const mcsv1Context& rhs); EXPORT mcsv1Context& operator=(const mcsv1Context& rhs);
EXPORT mcsv1Context& copy(const mcsv1Context& rhs); EXPORT mcsv1Context& copy(const mcsv1Context& rhs);
// Character collation support // Character collation support
EXPORT void setCharsetNumber(uint32_t csNum); EXPORT void setCharsetNumber(uint32_t csNum);
EXPORT uint32_t getCharsetNumber(); // Returns the unique ID for the language/collation EXPORT uint32_t getCharsetNumber(); // Returns the unique ID for the language/collation
@ -446,7 +446,7 @@ struct ColumnDatum
uint32_t precision; // If dataType is a DECIMAL type uint32_t precision; // If dataType is a DECIMAL type
std::string alias; // Only filled in for init() std::string alias; // Only filled in for init()
uint32_t charsetNumber; // For string collations uint32_t charsetNumber; // For string collations
ColumnDatum() : dataType(execplan::CalpontSystemCatalog::UNDEFINED), ColumnDatum() : dataType(execplan::CalpontSystemCatalog::UNDEFINED),
scale(0), precision(-1), charsetNumber(8) {}; scale(0), precision(-1), charsetNumber(8) {};
}; };
@ -860,12 +860,7 @@ inline void mcsv1Context::setInterrupted(bool* interrupted)
inline bool mcsv1Context::getInterrupted() const inline bool mcsv1Context::getInterrupted() const
{ {
if (bInterrupted) return bInterrupted && *bInterrupted;
{
return bInterrupted;
}
return false;
} }
inline void mcsv1Context::setUserDataSize(int bytes) inline void mcsv1Context::setUserDataSize(int bytes)