Merge pull request #246 from lehmann-4178656ch/indexpath-for-stxxl

Move .stxxl file into index directory
ad-freiburg · May 9, 2019 · 07187c6 · 07187c6
2 parents 54cb297 + 85ae833
commit 07187c6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/src/index/CreatePatternsMain.cpp b/src/index/CreatePatternsMain.cpp
@@ -30,6 +30,12 @@ struct option options[] = {{"help", no_argument, NULL, 'h'},
                            {"index-basename", required_argument, NULL, 'i'},
                            {NULL, 0, NULL, 0}};
 
+string getStxxlConfigFileName(const string& location) {
+  std::ostringstream os;
+  os << location << ".stxxl";
+  return os.str();
+}
+
 string getStxxlDiskFileName(const string& location, const string& tail) {
   std::ostringstream os;
   os << location << tail << "-stxxl.disk";
@@ -39,11 +45,14 @@ string getStxxlDiskFileName(const string& location, const string& tail) {
 // Write a .stxxl config-file.
 // All we want is sufficient space somewhere with enough space.
 // We can use the location of input files and use a constant size for now.
-// The required size can only ben estimation anyway, since index size
+// The required size can only be estimated anyway, since index size
 // depends on the structure of words files rather than their size only,
 // because of the "multiplications" performed.
 void writeStxxlConfigFile(const string& location, const string& tail) {
-  ad_utility::File stxxlConfig(".stxxl", "w");
+  string stxxlConfigFileName = getStxxlConfigFileName(location);
+  ad_utility::File stxxlConfig(stxxlConfigFileName, "w");
+  // Inform stxxl about .stxxl location
+  setenv("STXXLCFG", stxxlConfigFileName.c_str(), true);
   std::ostringstream config;
   config << "disk=" << getStxxlDiskFileName(location, tail) << ","
          << STXXL_DISK_SIZE_INDEX_BUILDER << ",syscall";

diff --git a/src/index/IndexBuilderMain.cpp b/src/index/IndexBuilderMain.cpp
@@ -45,6 +45,12 @@ struct option options[] = {
     {"no-compressed-vocabulary", no_argument, NULL, 'N'},
     {NULL, 0, NULL, 0}};
 
+string getStxxlConfigFileName(const string& location) {
+  std::ostringstream os;
+  os << location << ".stxxl";
+  return os.str();
+}
+
 string getStxxlDiskFileName(const string& location, const string& tail) {
   std::ostringstream os;
   os << location << tail << "-stxxl.disk";
@@ -54,11 +60,14 @@ string getStxxlDiskFileName(const string& location, const string& tail) {
 // Write a .stxxl config-file.
 // All we want is sufficient space somewhere with enough space.
 // We can use the location of input files and use a constant size for now.
-// The required size can only ben estimation anyway, since index size
+// The required size can only be estimated anyway, since index size
 // depends on the structure of words files rather than their size only,
 // because of the "multiplications" performed.
 void writeStxxlConfigFile(const string& location, const string& tail) {
-  ad_utility::File stxxlConfig(".stxxl", "w");
+  string stxxlConfigFileName = getStxxlConfigFileName(location);
+  ad_utility::File stxxlConfig(stxxlConfigFileName, "w");
+  // Inform stxxl about .stxxl location
+  setenv("STXXLCFG", stxxlConfigFileName.c_str(), true);
   std::ostringstream config;
   config << "disk=" << getStxxlDiskFileName(location, tail) << ","
          << STXXL_DISK_SIZE_INDEX_BUILDER << ",syscall";

diff --git a/test/IndexTest.cpp b/test/IndexTest.cpp
@@ -8,6 +8,12 @@
 #include "../src/global/Pattern.h"
 #include "../src/index/Index.h"
 
+string getStxxlConfigFileName(const string& location) {
+  std::ostringstream os;
+  os << location << ".stxxl";
+  return os.str();
+}
+
 string getStxxlDiskFileName(const string& location, const string& tail) {
   std::ostringstream os;
   os << location << tail << "-stxxl.disk";
@@ -17,11 +23,14 @@ string getStxxlDiskFileName(const string& location, const string& tail) {
 // Write a .stxxl config-file.
 // All we want is sufficient space somewhere with enough space.
 // We can use the location of input files and use a constant size for now.
-// The required size can only ben estimation anyway, since index size
+// The required size can only be estimated anyway, since index size
 // depends on the structure of words files rather than their size only,
 // because of the "multiplications" performed.
 void writeStxxlConfigFile(const string& location, const string& tail) {
-  ad_utility::File stxxlConfig(".stxxl", "w");
+  string stxxlConfigFileName = getStxxlConfigFileName(location);
+  ad_utility::File stxxlConfig(stxxlConfigFileName, "w");
+  // Inform stxxl about .stxxl location
+  setenv("STXXLCFG", stxxlConfigFileName.c_str(), true);
   std::ostringstream config;
   config << "disk=" << getStxxlDiskFileName(location, tail) << ","
          << STXXL_DISK_SIZE_INDEX_TEST << ",syscall";