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

Merge branch 'develop-1.1' into 1.1-merge-up-20180817

Browse Source
This commit is contained in:
Andrew Hutchings
2018-08-17 16:17:13 +01:00
parent e0a3f4278b fdb4ef7f79
commit 03da6df473
47 changed files with 1526 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbcon/execplan/arithmeticcolumn.cpp
View File

@ -368,11 +368,7 @@ bool ArithmeticColumn::operator==(const ArithmeticColumn& t) const
else if (fExpression != NULL || t.fExpression != NULL)
return false;
if (fAlias != t.fAlias)
return false;
if (fTableAlias != t.fTableAlias)
return false;
if (fData != t.fData)
return false;

31
dbcon/execplan/clientrotator.cpp
View File

@ -49,6 +49,15 @@ using namespace logging;
#include "clientrotator.h"
//#include "idb_mysql.h"
/** Debug macro */
#ifdef INFINIDB_DEBUG
#define IDEBUG(x) {x;}
#else
#define IDEBUG(x) {}
#endif
#define LOG_TO_CERR
namespace execplan
@ -60,14 +69,36 @@ const uint64_t LOCAL_EXEMGR_PORT = 8601;
string ClientRotator::getModule()
{
string installDir = startup::StartUp::installDir();
//Log to debug.log
LoggingID logid( 24, 0, 0);
string fileName = installDir + "/local/module";
string module;
ifstream moduleFile (fileName.c_str());
if (moduleFile.is_open())
{
getline (moduleFile, module);
}
else
{
{
logging::Message::Args args1;
logging::Message msg(1);
std::ostringstream oss;
oss << "ClientRotator::getModule open status2 =" << strerror(errno);
args1.add(oss.str());
args1.add(fileName);
msg.format( args1 );
Logger logger(logid.fSubsysID);
logger.logMessage(LOG_TYPE_DEBUG, msg, logid);
}
}
moduleFile.close();
return module;
}

2
dbcon/execplan/constantcolumn.cpp
View File

@ -328,8 +328,6 @@ bool ConstantColumn::operator==(const ConstantColumn& t) const
if (fType != t.fType)
return false;
if (fAlias != t.fAlias)
return false;
if (fData != t.fData)
return false;

2
dbcon/execplan/functioncolumn.cpp
View File

@ -332,8 +332,6 @@ bool FunctionColumn::operator==(const FunctionColumn& t) const
if (**it != **it2)
return false;
// if (fAlias != t.fAlias)
// return false;
if (fTableAlias != t.fTableAlias)
return false;

9
dbcon/execplan/returnedcolumn.cpp
View File

@ -173,14 +173,13 @@ void ReturnedColumn::unserialize(messageqcpp::ByteStream& b)
bool ReturnedColumn::operator==(const ReturnedColumn& t) const
{
// Not all fields are considered for a positive equality.
if (fData != t.fData)
return false;
if (fCardinality != t.fCardinality)
return false;
//if (fAlias != t.fAlias)
// return false;
if (fDistinct != t.fDistinct)
return false;
@ -193,24 +192,18 @@ bool ReturnedColumn::operator==(const ReturnedColumn& t) const
if (fNullsFirst != t.fNullsFirst)
return false;
//if (fOrderPos != t.fOrderPos)
// return false;
if (fInputIndex != t.fInputIndex)
return false;
if (fOutputIndex != t.fOutputIndex)
return false;
//if (fSequence != t.fSequence)
// return false;
if (fResultType != t.fResultType)
return false;
if (fOperationType != t.fOperationType)
return false;
//if (fExpressionId != t.fExpressionId)
// return false;
return true;
}

6
dbcon/execplan/simplecolumn.cpp
View File

@ -346,7 +346,6 @@ void SimpleColumn::serialize(messageqcpp::ByteStream& b) const
b << fViewName;
b << (uint32_t) fOid;
b << fData;
//b << fAlias;
b << fTableAlias;
b << (uint32_t) fSequence;
b << static_cast<const ByteStream::doublebyte>(fIsInfiniDB);
@ -363,7 +362,6 @@ void SimpleColumn::unserialize(messageqcpp::ByteStream& b)
b >> fViewName;
b >> (uint32_t&) fOid;
b >> fData;
//b >> fAlias;
b >> fTableAlias;
b >> (uint32_t&) fSequence;
b >> reinterpret_cast< ByteStream::doublebyte&>(fIsInfiniDB);
@ -388,8 +386,6 @@ bool SimpleColumn::operator==(const SimpleColumn& t) const
if (fColumnName != t.fColumnName)
return false;
// if (fIndexName != t.fIndexName)
// return false;
if (fViewName != t.fViewName)
return false;
@ -399,8 +395,6 @@ bool SimpleColumn::operator==(const SimpleColumn& t) const
if (data() != t.data())
return false;
// if (fAlias != t.fAlias)
// return false;
if (fTableAlias != t.fTableAlias)
return false;