From 5fa5c81b6724f3d25a7cbab6e44dd4554aaf2a8a Mon Sep 17 00:00:00 2001
From: David Hill <david.hill@mariadb.com>
Date: Tue, 25 Sep 2018 14:03:00 -0500
Subject: [PATCH] MCOL-520

---
 exemgr/main.cpp                   |  7 ++-----
 oam/etc/Columnstore.xml           | 12 ++++++------
 tools/configMgt/autoConfigure.cpp |  4 ++--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/exemgr/main.cpp b/exemgr/main.cpp
index 47f71140c..afecb1129 100644
--- a/exemgr/main.cpp
+++ b/exemgr/main.cpp
@@ -1370,14 +1370,11 @@ void cleanTempDir()
 {
     config::Config* config = config::Config::makeConfig();
     string allowDJS = config->getConfig("HashJoin", "AllowDiskBasedJoin");
-    string tmpPrefix = config->getConfig("HashJoin", "TempFilePath");
+    string tmpPrefix = startup::StartUp::tmpDir();
 
     if (allowDJS == "N" || allowDJS == "n")
         return;
-
-    if (tmpPrefix.empty())
-        tmpPrefix = "/tmp/infinidb";
-
+        
     tmpPrefix += "/";
 
     assert(tmpPrefix != "/");
diff --git a/oam/etc/Columnstore.xml b/oam/etc/Columnstore.xml
index 3d4f4383e..f8cda9d65 100644
--- a/oam/etc/Columnstore.xml
+++ b/oam/etc/Columnstore.xml
@@ -249,9 +249,9 @@
 		<ExternalCriticalThreshold>90</ExternalCriticalThreshold>
 		<ExternalMajorThreshold>80</ExternalMajorThreshold>
 		<ExternalMinorThreshold>70</ExternalMinorThreshold>
-		<!-- <TempDiskPath>${tmpDir}</TempDiskPath>
-		<WorkingDir>${tmpDir}</WorkingDir>
-		<TempFileDir>${tmpDir}/columnstore_tmp_files</TempFileDir>
+		<!-- <TempDiskPath>/tmp</TempDiskPath>
+		<WorkingDir>/tmp</WorkingDir>
+		<TempFileDir>/tmp/columnstore_tmp_files</TempFileDir>
 		-->
 		<TransactionArchivePeriod>10</TransactionArchivePeriod>
 		<NMSIPAddress>0.0.0.0</NMSIPAddress>
@@ -269,7 +269,7 @@
 		-->
  		<hdfsRdwrScratch>/rdwrscratch</hdfsRdwrScratch> <!-- Do not set to an hdfs file path -->
  		<TempFileDir>/columnstore_tmp_files</TempFileDir>
- 		<SystemTempFileDir>${tmpDir}/columnstore_tmp_files</SystemTempFileDir>
+ 		<SystemTempFileDir>/tmp/columnstore_tmp_files</SystemTempFileDir>
 	</SystemConfig>
 	<SystemModuleConfig>
 		<ModuleType1>dm</ModuleType1>
@@ -494,8 +494,8 @@
 		<AllowDiskBasedJoin>N</AllowDiskBasedJoin>
 		<!-- Be careful modifying TempFilePath!  On start, ExeMgr deletes
 			the entire directory and recreates it to make sure no
-			files are left behind.  -->
-		<TempFilePath>$INSTALLDIR${tmpDir}</TempFilePath>
+			files are left behind.
+		<TempFilePath>/tmp</TempFilePath>  -->
 		<TempFileCompression>Y</TempFileCompression>
 	</HashJoin>
 	<JobList>
diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp
index b30536d8d..5cb7a1a80 100644
--- a/tools/configMgt/autoConfigure.cpp
+++ b/tools/configMgt/autoConfigure.cpp
@@ -48,6 +48,8 @@
 
 #include "liboamcpp.h"
 #include "configcpp.h"
+#include "installdir.h"
+
 
 using namespace std;
 using namespace oam;
@@ -2009,13 +2011,11 @@ int main(int argc, char* argv[])
 
         if ( !AllowDiskBasedJoin.empty() )
         {
-            TempFilePath = sysConfigOld->getConfig("HashJoin", "TempFilePath");
             TempFileCompression = sysConfigOld->getConfig("HashJoin", "TempFileCompression");
 
             try
             {
                 sysConfigNew->setConfig("HashJoin", "AllowDiskBasedJoin", AllowDiskBasedJoin);
-                sysConfigNew->setConfig("HashJoin", "TempFilePath", TempFilePath);
                 sysConfigNew->setConfig("HashJoin", "TempFileCompression", TempFileCompression);
             }
             catch (...)