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

MCOL-3 directory name changes

Browse Source
This commit is contained in:
david hill
2016-05-31 16:40:30 -05:00
parent 29a89c1b36
commit eff8f39801
277 changed files with 9489 additions and 1702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
versioning/BRM/Calpont.xml
View File

@@ -251,7 +251,7 @@
<ModuleHeartbeatPeriod>5</ModuleHeartbeatPeriod>
<ModuleHeartbeatCount>3</ModuleHeartbeatCount>
<ProcessHeartbeatPeriod>60</ProcessHeartbeatPeriod>
<DBRoot>/usr/local/MariaDB/Columnstore/data</DBRoot>
<DBRoot>/usr/local/mariadb/columnstore/data</DBRoot>
<DBRMRoot>/home/pleblanc/DBRMRoot_test</DBRMRoot>
<RAIDCriticalThreshold>90</RAIDCriticalThreshold>
<RAIDMajorThreshold>80</RAIDMajorThreshold>
@@ -355,7 +355,7 @@
</VersionBuffer>
<OIDManager>
<!-- XXXPAT: This is located in tmp so we all have R/W access.
It should be relocated to /usr/local/MariaDB/Columnstore/share/oidbitmap
It should be relocated to /usr/local/mariadb/columnstore/share/oidbitmap
on the production machine-->
<OIDBitmapFile>/tmp/oidbitmap</OIDBitmapFile>
<FirstOID>3000</FirstOID>
@@ -364,7 +364,7 @@
<OnDisconnect>Commit</OnDisconnect> <!-- or Rollback -->
</OracleConnector>
<WriteEngine>
<BulkRoot>/usr/local/MariaDB/Columnstore/data/bulk</BulkRoot>
<BulkRoot>/usr/local/mariadb/columnstore/data/bulk</BulkRoot>
</WriteEngine>
<!-- The DBRM configuration entries should look like this.
<DBRM_Master>

2
versioning/BRM/Makefile
View File

@@ -23,7 +23,7 @@ TLIBS=-L. -lbrm -L$(EXPORT_ROOT)/lib -lrwlock -lmessageqcpp -ldl -lpthread -lcpp
-lconfigcpp -lxml2 -lexecplan -ljoblist -lfuncexp -ljoiner -lcommon \
-ldataconvert -lloggingcpp -lrowgroup
GLIBS=-L. -lbrm -L$(EXPORT_ROOT)/lib $(IDB_COMMON_LIBS) $(IDB_SNMP_LIBS) -Wl,--rpath -Wl,/usr/local/MariaDB/Columnstore/lib
GLIBS=-L. -lbrm -L$(EXPORT_ROOT)/lib $(IDB_COMMON_LIBS) $(IDB_SNMP_LIBS) -Wl,--rpath -Wl,/usr/local/mariadb/columnstore/lib
OAMLIBS=-loamcpp -lsnmpmanager -lnetsnmp \
-lnetsnmpagent -lnetsnmphelpers -lnetsnmpmibs

BIN
versioning/BRM/autoinctest Executable file
View File

Binary file not shown.

BIN
versioning/BRM/copylocktest Executable file
View File

Binary file not shown.

4
versioning/BRM/slavecomm.cpp
View File

@@ -1903,8 +1903,8 @@ int SlaveComm::replayJournal(string prefix)
// argument.
// If A or B files are being loaded, strip off the A or B for the journal file name as there is only one journal file.
// For example, if prefix is "/usr/local/MariaDB/Columnstore/data1/systemFiles/dbrm/BRM_savesA" the journal file name will be
// "/usr/local/MariaDB/Columnstore/data1/systemFiles/dbrm/BRM_saves_journal".
// For example, if prefix is "/usr/local/mariadb/columnstore/data1/systemFiles/dbrm/BRM_savesA" the journal file name will be
// "/usr/local/mariadb/columnstore/data1/systemFiles/dbrm/BRM_saves_journal".
string tmp = prefix.substr(prefix.length()-1);
string fName;

BIN
versioning/BRM/tablelocktest Executable file
View File

Binary file not shown.

2
versioning/BRM/tracer.cpp
View File

@@ -37,7 +37,7 @@ using namespace std;
namespace BRM {
#ifdef BRM_INFO
std::ofstream brmlog("/var/log/Columnstore/brm.log", std::ios::app);
std::ofstream brmlog("/var/log/mariadb/columnstore/brm.log", std::ios::app);
Tracer::Tracer(const std::string& file, int line, const std::string& msg, bool debug, bool writeNow): fFileName(file), fLine(line), fMsg(msg), fDebug(debug), fpid(getpid())
{

2
versioning/BRM/tracer.h
View File

@@ -42,7 +42,7 @@ namespace BRM {
/** @brief Trace beginning and end of a call.
*
* When turned on, fDebug is true, Tracer writes informational messages to /var/log/Columnstore/brm.log.
* When turned on, fDebug is true, Tracer writes informational messages to /var/log/mariadb/columnstore/brm.log.
* It keeps track of integral, string and boolean inputs, and integral and boolean outputs.
* If it should print a message immediately from the constructor, call it with the final parameter,
* writeNow, true (default). If input and output parameters need to be added, call it with