You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by ji...@apache.org on 2016/06/23 17:04:00 UTC
[15/16] incubator-quickstep git commit: updates
updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/8ae13570
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/8ae13570
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/8ae13570
Branch: refs/heads/adaptive-bloom-filters
Commit: 8ae1357016f3c2906868d7c06716a55960aec216
Parents: daff441
Author: Jianqiao Zhu <ji...@cs.wisc.edu>
Authored: Tue Jun 21 14:37:03 2016 -0500
Committer: Jianqiao Zhu <ji...@cs.wisc.edu>
Committed: Tue Jun 21 14:37:03 2016 -0500
----------------------------------------------------------------------
cli/QuickstepCli.cpp | 7 +++++++
query_execution/Worker.cpp | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/8ae13570/cli/QuickstepCli.cpp
----------------------------------------------------------------------
diff --git a/cli/QuickstepCli.cpp b/cli/QuickstepCli.cpp
index 42c5a04..5f47dc0 100644
--- a/cli/QuickstepCli.cpp
+++ b/cli/QuickstepCli.cpp
@@ -52,6 +52,9 @@ typedef quickstep::LineReaderDumb LineReaderImpl;
#include <gperftools/profiler.h>
#endif
+#include "catalog/CatalogDatabase.hpp"
+#include "catalog/CatalogRelation.hpp"
+#include "catalog/CatalogRelationConstraints.hpp"
#include "cli/DefaultsConfigurator.hpp"
#include "cli/InputParserUtil.hpp"
#include "cli/PrintToScreen.hpp"
@@ -196,6 +199,10 @@ DEFINE_bool(visualize_dag, false,
} // namespace quickstep
+void addPrimaryKeyInfoForTPCHTables(quickstep::CatalogDatabase *database) {
+
+}
+
int main(int argc, char* argv[]) {
google::InitGoogleLogging(argv[0]);
gflags::ParseCommandLineFlags(&argc, &argv, true);
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/8ae13570/query_execution/Worker.cpp
----------------------------------------------------------------------
diff --git a/query_execution/Worker.cpp b/query_execution/Worker.cpp
index 35b106c..ae889c7 100644
--- a/query_execution/Worker.cpp
+++ b/query_execution/Worker.cpp
@@ -29,7 +29,6 @@
#include "relational_operators/WorkOrder.hpp"
#include "threading/ThreadIDBasedMap.hpp"
#include "threading/ThreadUtil.hpp"
-#include "utility/EventProfiler.hpp"
#include "glog/logging.h"
@@ -71,6 +70,7 @@ void Worker::run() {
serialization::RebuildWorkOrderCompletionMessage proto;
executeWorkOrderHelper<
serialization::RebuildWorkOrderCompletionMessage>(tagged_message,
+ &proto);
sendWorkOrderCompleteMessage<
serialization::RebuildWorkOrderCompletionMessage>(
annotated_msg.sender, proto, kRebuildWorkOrderCompleteMessage);