You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by zu...@apache.org on 2016/05/27 03:23:01 UTC
[10/50] [abbrv] incubator-quickstep git commit: Minor fixes.
Minor fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/950ac445
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/950ac445
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/950ac445
Branch: refs/heads/preloader-cleanup
Commit: 950ac4458afd9eeffe0eea312085697f0a4644d0
Parents: 814794d
Author: Harshad Deshmukh <ha...@cs.wisc.edu>
Authored: Wed May 4 21:54:07 2016 -0500
Committer: Harshad Deshmukh <ha...@cs.wisc.edu>
Committed: Wed May 4 21:54:07 2016 -0500
----------------------------------------------------------------------
storage/PreloaderThread.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/950ac445/storage/PreloaderThread.cpp
----------------------------------------------------------------------
diff --git a/storage/PreloaderThread.cpp b/storage/PreloaderThread.cpp
index 2fe7626..b351893 100644
--- a/storage/PreloaderThread.cpp
+++ b/storage/PreloaderThread.cpp
@@ -17,6 +17,8 @@
#include "storage/PreloaderThread.hpp"
+#include "storage/StorageConfig.h"
+
#include <cstddef>
#include <vector>
@@ -29,7 +31,6 @@
#include "catalog/CatalogTypedefs.hpp"
#include "storage/StorageBlock.hpp"
#include "storage/StorageBlockInfo.hpp"
-#include "storage/StorageConfig.h"
#include "storage/StorageManager.hpp"
#include "threading/ThreadUtil.hpp"
@@ -59,7 +60,7 @@ void PreloaderThread::run() {
BlockReference current_block =
storage_manager_->getBlock(current_block_id, relation);
} catch (...) {
- LOG(ERROR) << "Error after loading " << blocks_loaded << "blocks\n";
+ LOG(ERROR) << "Error after loading " << blocks_loaded << "blocks";
throw;
}
++blocks_loaded;
@@ -73,7 +74,7 @@ void PreloaderThread::run() {
}
}
LOG(INFO) << "Relation " << relation.getName()
- << " completely preloaded in buffer pool\n";
+ << " completely preloaded in buffer pool";
}
}
printf("Loaded %lu blocks", blocks_loaded);
@@ -106,7 +107,7 @@ std::size_t PreloaderThread::preloadNUMAAware(
LOG(ERROR) << "Error while preloading: " << " After loading total "
<< blocks_loaded + num_previously_loaded_blocks
<< " blocks and " << blocks_loaded
- << " blocks of relation " << relation.getName() << "\n";
+ << " blocks of relation " << relation.getName();
throw;
}
++blocks_loaded;