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

3
primitives/linux-port/column.cpp
View File

@ -65,8 +65,6 @@ inline uint64_t order_swap(uint64_t x)
template <int W>
inline string fixChar(int64_t intval);
idb_regex_t placeholderRegex;
template <class T>
inline int compareBlock( const void* a, const void* b )
{
@ -1095,6 +1093,7 @@ inline void p_Col_ridArray(NewColRequestHeader* in,
uint16_t* ridArray = 0;
uint8_t* in8 = reinterpret_cast<uint8_t*>(in);
const uint8_t filterSize = sizeof(uint8_t) + sizeof(uint8_t) + W;
idb_regex_t placeholderRegex;
placeholderRegex.used = false;

20
primitives/primproc/primproc.cpp
View File

@ -321,6 +321,22 @@ int main(int argc, char* argv[])
// This is unset due to the way we start it
program_invocation_short_name = const_cast<char*>("PrimProc");
int gDebug = 0;
int c;
while ((c = getopt(argc, argv, "d")) != EOF)
{
switch(c)
{
case 'd':
gDebug++;
break;
case '?':
default:
break;
}
}
Config* cf = Config::makeConfig();
setupSignalHandlers();
@ -329,7 +345,9 @@ int main(int argc, char* argv[])
mlp = new primitiveprocessor::Logger();
int err = setupResources();
int err = 0;
if (!gDebug)
err = setupResources();
string errMsg;
switch (err)