Merge branch 'development'

splatlab · Aug 13, 2019 · 7d1229e · 7d1229e
2 parents 6131c30 + 5b7b3e8
commit 7d1229e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/gqf/gqf_file.c b/src/gqf/gqf_file.c
@@ -49,11 +49,11 @@ bool qf_initfile(QF *qf, uint64_t nslots, uint64_t key_bits, uint64_t
 		perror("Couldn't open file.");
 		exit(EXIT_FAILURE);
 	}
-	ret = posix_fallocate(qf->runtimedata->f_info.fd, 0, total_num_bytes);
-	if (ret < 0) {
-		perror("Couldn't fallocate file:\n");
-		exit(EXIT_FAILURE);
-	}
+	/*ret = posix_fallocate(qf->runtimedata->f_info.fd, 0, total_num_bytes);*/
+	/*if (ret < 0) {*/
+		/*perror("Couldn't fallocate file:\n");*/
+		/*exit(EXIT_FAILURE);*/
+	/*}*/
 	qf->metadata = (qfmetadata *)mmap(NULL, total_num_bytes, PROT_READ |
 																		PROT_WRITE, MAP_SHARED,
 																		qf->runtimedata->f_info.fd, 0);
@@ -63,7 +63,7 @@ bool qf_initfile(QF *qf, uint64_t nslots, uint64_t key_bits, uint64_t
 	}
 	ret = madvise(qf->metadata, total_num_bytes, MADV_RANDOM);
 	if (ret < 0) {
-		perror("Couldn't fallocate file.");
+		perror("Couldn't madvise file.");
 		exit(EXIT_FAILURE);
 	}
 	qf->blocks = (qfblock *)(qf->metadata + 1);

diff --git a/src/squeakr.cc b/src/squeakr.cc
@@ -166,7 +166,7 @@ int main ( int argc, char *argv[] ) {
 							(count_mode | query_mode | inner_prod_mode | list_mode |
 							 info_mode |
 							 command("help").set(selected,mode::help) ),
-							option("-v", "--version").call([]{std::cout << "version 1.0\n\n";}).doc("show version")
+							option("-v", "--version").call([]{std::cout << "version 0.7\n\n";}).doc("show version")
 							);
 
   assert(count_mode.flags_are_prefix_free());