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

Merge pull request #345 from mariadb-corporation/1.0-merge-up

Browse Source 
1.0 merge up
This commit is contained in:
David.Hall
2017-12-12 16:44:54 -06:00
committed by GitHub
parent ca2c511f59 8babe4a35d
commit a89438c5fe
11 changed files with 129 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/clusterTester/columnstoreClusterTester.sh
View File

@@ -978,7 +978,7 @@ checkPackages()
fi
fi
declare -a DEBIAN9_PKG=("libboost-all-dev" "expect" "libdbi-perl" "perl" "openssl" "file" "sudo" "libreadline5" "rsync" "libsnappy1V5" "net-tools" "libioa1")
declare -a DEBIAN9_PKG=("libboost-all-dev" "expect" "libdbi-perl" "perl" "openssl" "file" "sudo" "libreadline5" "rsync" "libsnappy1V5" "net-tools" "libaio1")
if [ "$OS" == "debian9" ]; then
if [ ! `which dpkg 2>/dev/null` ] ; then

25
utils/configcpp/xmlparser.cpp
View File

@@ -22,6 +22,7 @@
#include "config.h"
#include <string>
#include <boost/algorithm/string.hpp>
#include <stdexcept>
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
@@ -43,12 +44,14 @@ const string XMLParser::getConfig(const xmlDocPtr doc, const string& section, co
cur1 = cur1->xmlChildrenNode;
while (cur1 != NULL)
{
if ((!xmlStrcmp(cur1->name, (const xmlChar *)section.c_str())))
string cur1name = (const char*)cur1->name;
if ((boost::iequals(cur1name, section)))
{
xmlNodePtr cur2 = cur1->xmlChildrenNode;
while (cur2 != NULL)
{
if ((!xmlStrcmp(cur2->name, (const xmlChar*)name.c_str())))
string cur2name = (const char*)cur2->name;
if ((boost::iequals(cur2name, name)))
{
xmlNodePtr cur3 = cur2->xmlChildrenNode;
if (cur3)
@@ -75,12 +78,14 @@ void XMLParser::getConfig(const xmlDocPtr doc, const string& section, const stri
cur1 = cur1->xmlChildrenNode;
while (cur1 != NULL)
{
if ((!xmlStrcmp(cur1->name, (const xmlChar *)section.c_str())))
string cur1name = (const char*)cur1->name;
if ((boost::iequals(cur1name, section)))
{
xmlNodePtr cur2 = cur1->xmlChildrenNode;
while (cur2 != NULL)
{
if ((!xmlStrcmp(cur2->name, (const xmlChar*)name.c_str())))
string cur2name = (const char*)cur2->name;
if ((boost::iequals(cur2name, name)))
{
res.clear();
xmlNodePtr cur3 = cur2->xmlChildrenNode;
@@ -106,12 +111,14 @@ void XMLParser::setConfig(xmlDocPtr doc, const string& section, const string& na
cur1 = cur1->xmlChildrenNode;
while (cur1 != NULL)
{
if (xmlStrcmp(cur1->name, (const xmlChar *)section.c_str()) == 0)
string cur1name = (const char*)cur1->name;
if (boost::iequals(cur1name, section))
{
cur2 = cur1->xmlChildrenNode;
while (cur2 != NULL)
{
if (xmlStrcmp(cur2->name, (const xmlChar*)name.c_str()) == 0)
string cur2name = (const char*)cur2->name;
if (boost::iequals(cur2name, name))
{
xmlNodePtr cur3 = cur2->xmlChildrenNode;
if (cur3 == NULL)
@@ -160,14 +167,16 @@ void XMLParser::delConfig(xmlDocPtr doc, const string& section, const string& na
cur1 = cur1->xmlChildrenNode;
while (cur1 != NULL)
{
if ((!xmlStrcmp(cur1->name, (const xmlChar *)section.c_str())))
string cur1name = (const char*)cur1->name;
if ((boost::iequals(cur1name, section)))
{
xmlNodePtr cur2 = cur1->xmlChildrenNode;
while (cur2 != NULL)
{
xmlNodePtr tmp = cur2;
cur2 = cur2->next;
if ((!xmlStrcmp(tmp->name, (const xmlChar*)name.c_str())))
string tmpname = (const char*)tmp->name;
if ((boost::iequals(tmpname, name)))
{
xmlUnlinkNode(tmp);
xmlFreeNode(tmp);