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

MCOL-520

Browse Source
This commit is contained in:
David Hill
2018-09-25 14:03:00 -05:00
parent 8754476272
commit 5fa5c81b67
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
exemgr/main.cpp
View File

@ -1370,14 +1370,11 @@ void cleanTempDir()
{ {
config::Config* config = config::Config::makeConfig(); config::Config* config = config::Config::makeConfig();
string allowDJS = config->getConfig("HashJoin", "AllowDiskBasedJoin"); string allowDJS = config->getConfig("HashJoin", "AllowDiskBasedJoin");
string tmpPrefix = config->getConfig("HashJoin", "TempFilePath"); string tmpPrefix = startup::StartUp::tmpDir();
if (allowDJS == "N" || allowDJS == "n") if (allowDJS == "N" || allowDJS == "n")
return; return;
if (tmpPrefix.empty())
tmpPrefix = "/tmp/infinidb";
tmpPrefix += "/"; tmpPrefix += "/";
assert(tmpPrefix != "/"); assert(tmpPrefix != "/");

12
oam/etc/Columnstore.xml
View File

@ -249,9 +249,9 @@
<ExternalCriticalThreshold>90</ExternalCriticalThreshold> <ExternalCriticalThreshold>90</ExternalCriticalThreshold>
<ExternalMajorThreshold>80</ExternalMajorThreshold> <ExternalMajorThreshold>80</ExternalMajorThreshold>
<ExternalMinorThreshold>70</ExternalMinorThreshold> <ExternalMinorThreshold>70</ExternalMinorThreshold>
<!-- <TempDiskPath>${tmpDir}</TempDiskPath> <!-- <TempDiskPath>/tmp</TempDiskPath>
<WorkingDir>${tmpDir}</WorkingDir> <WorkingDir>/tmp</WorkingDir>
<TempFileDir>${tmpDir}/columnstore_tmp_files</TempFileDir> <TempFileDir>/tmp/columnstore_tmp_files</TempFileDir>
--> -->
<TransactionArchivePeriod>10</TransactionArchivePeriod> <TransactionArchivePeriod>10</TransactionArchivePeriod>
<NMSIPAddress>0.0.0.0</NMSIPAddress> <NMSIPAddress>0.0.0.0</NMSIPAddress>
@ -269,7 +269,7 @@
--> -->
<hdfsRdwrScratch>/rdwrscratch</hdfsRdwrScratch> <!-- Do not set to an hdfs file path --> <hdfsRdwrScratch>/rdwrscratch</hdfsRdwrScratch> <!-- Do not set to an hdfs file path -->
<TempFileDir>/columnstore_tmp_files</TempFileDir> <TempFileDir>/columnstore_tmp_files</TempFileDir>
<SystemTempFileDir>${tmpDir}/columnstore_tmp_files</SystemTempFileDir> <SystemTempFileDir>/tmp/columnstore_tmp_files</SystemTempFileDir>
</SystemConfig> </SystemConfig>
<SystemModuleConfig> <SystemModuleConfig>
<ModuleType1>dm</ModuleType1> <ModuleType1>dm</ModuleType1>
@ -494,8 +494,8 @@
<AllowDiskBasedJoin>N</AllowDiskBasedJoin> <AllowDiskBasedJoin>N</AllowDiskBasedJoin>
<!-- Be careful modifying TempFilePath! On start, ExeMgr deletes <!-- Be careful modifying TempFilePath! On start, ExeMgr deletes
the entire directory and recreates it to make sure no the entire directory and recreates it to make sure no
files are left behind. --> files are left behind.
<TempFilePath>$INSTALLDIR${tmpDir}</TempFilePath> <TempFilePath>/tmp</TempFilePath> -->
<TempFileCompression>Y</TempFileCompression> <TempFileCompression>Y</TempFileCompression>
</HashJoin> </HashJoin>
<JobList> <JobList>

4
tools/configMgt/autoConfigure.cpp
View File

@ -48,6 +48,8 @@
#include "liboamcpp.h" #include "liboamcpp.h"
#include "configcpp.h" #include "configcpp.h"
#include "installdir.h"
using namespace std; using namespace std;
using namespace oam; using namespace oam;
@ -2009,13 +2011,11 @@ int main(int argc, char* argv[])
if ( !AllowDiskBasedJoin.empty() ) if ( !AllowDiskBasedJoin.empty() )
{ {
TempFilePath = sysConfigOld->getConfig("HashJoin", "TempFilePath");
TempFileCompression = sysConfigOld->getConfig("HashJoin", "TempFileCompression"); TempFileCompression = sysConfigOld->getConfig("HashJoin", "TempFileCompression");
try try
{ {
sysConfigNew->setConfig("HashJoin", "AllowDiskBasedJoin", AllowDiskBasedJoin); sysConfigNew->setConfig("HashJoin", "AllowDiskBasedJoin", AllowDiskBasedJoin);
sysConfigNew->setConfig("HashJoin", "TempFilePath", TempFilePath);
sysConfigNew->setConfig("HashJoin", "TempFileCompression", TempFileCompression); sysConfigNew->setConfig("HashJoin", "TempFileCompression", TempFileCompression);
} }
catch (...) catch (...)