mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-06-10 17:41:44 +03:00
b53c231ca6
This patch improves handling of NULLs in textual fields in ColumnStore. Previously empty strings were considered NULLs and it could be a problem if data scheme allows for empty strings. It was also one of major reasons of behavior difference between ColumnStore and other engines in MariaDB family. Also, this patch fixes some other bugs and incorrect behavior, for example, incorrect comparison for "column <= ''" which evaluates to constant True for all purposes before this patch.
126 lines
2.7 KiB
C++
126 lines
2.7 KiB
C++
/* Copyright (C) 2014 InfiniDB, Inc.
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License
|
|
as published by the Free Software Foundation; version 2 of
|
|
the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
|
MA 02110-1301, USA. */
|
|
|
|
/******************************************************************************
|
|
* $Id$
|
|
*
|
|
*****************************************************************************/
|
|
/** @file */
|
|
|
|
#pragma once
|
|
|
|
#include <sys/types.h>
|
|
#include <vector>
|
|
#include <string>
|
|
#include <stdint.h>
|
|
|
|
#include "nullstring.h"
|
|
using namespace utils;
|
|
|
|
namespace execplan
|
|
{
|
|
/** @file
|
|
This serves as a bridge between the new and old joblist code.
|
|
ColumnResults are column data created from the TableBands
|
|
returned by the NJL. In getSysData, we convert TableBands
|
|
to NJLCR's to avoid having to rewrite all of the systemcatalog
|
|
code that used the old ColumnResult class. It only implements
|
|
the part of the ColumnResult API used by the system catalog.
|
|
Hack as necessary.
|
|
*/
|
|
class ColumnResult
|
|
{
|
|
public:
|
|
ColumnResult() : oid(0), dcount(0)
|
|
{
|
|
}
|
|
// the other defaults are OK.
|
|
|
|
int64_t GetData(uint32_t index) const
|
|
{
|
|
return intData[index];
|
|
}
|
|
|
|
void PutData(int64_t d)
|
|
{
|
|
intData.push_back(d);
|
|
dcount++;
|
|
}
|
|
|
|
const NullString& GetStringData(uint32_t index) const
|
|
{
|
|
return stringData[index];
|
|
}
|
|
|
|
void PutStringData(const NullString& s)
|
|
{
|
|
stringData.push_back(s);
|
|
dcount++;
|
|
}
|
|
|
|
void PutStringData(const char*str, size_t len)
|
|
{
|
|
idbassert(str != nullptr || len == 0);
|
|
NullString tmp(str, len);
|
|
PutStringData(tmp);
|
|
}
|
|
|
|
int ColumnOID() const
|
|
{
|
|
return oid;
|
|
}
|
|
|
|
void SetColumnOID(int o)
|
|
{
|
|
oid = o;
|
|
}
|
|
|
|
uint64_t GetRid(uint32_t index) const
|
|
{
|
|
return rids[index];
|
|
}
|
|
|
|
void PutRid(uint64_t rid)
|
|
{
|
|
rids.push_back(rid);
|
|
}
|
|
|
|
void PutRidOnly(uint64_t rid)
|
|
{
|
|
rids.push_back(rid);
|
|
dcount++;
|
|
}
|
|
|
|
int dataCount() const
|
|
{
|
|
return dcount;
|
|
}
|
|
|
|
private:
|
|
// defaults okay
|
|
// ColumnResult(const ColumnResult& rhs);
|
|
// ColumnResult& operator=(const ColumnResult& rhs);
|
|
|
|
std::vector<int64_t> intData;
|
|
std::vector<NullString> stringData;
|
|
std::vector<uint64_t> rids;
|
|
int oid;
|
|
int dcount; // data, string, and row counters
|
|
};
|
|
|
|
} // namespace execplan
|