QueryPlan{Builder,Node} (60398761) · Commits · github_fork / Clip

build/cmake/CMakeLists.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -46,14 +46,14 @@ set(FNORDMETRIC_QUERY_SOURCES
		stage/src/fnordmetric/query/queryservice.cc
		stage/src/fnordmetric/sql/astnode.cc
		stage/src/fnordmetric/sql/compile.cc
		stage/src/fnordmetric/sql/executable.cc
		stage/src/fnordmetric/sql/execute.cc
		stage/src/fnordmetric/sql/expressions/aggregate.cc
		stage/src/fnordmetric/sql/expressions/boolean.cc
		stage/src/fnordmetric/sql/expressions/math.cc
		stage/src/fnordmetric/sql/grouper.cc
		stage/src/fnordmetric/sql/parser.cc
		stage/src/fnordmetric/sql/queryplan.cc
		stage/src/fnordmetric/sql/queryplanbuilder.cc
		stage/src/fnordmetric/sql/queryplannode.cc
		stage/src/fnordmetric/sql/svalue.cc
		stage/src/fnordmetric/sql/symboltable.cc
		stage/src/fnordmetric/sql/token.cc

+1 −3

Original line number	Diff line number	Diff line
		@@ -10,12 +10,10 @@

		#include <stdlib.h>
		#include <string.h>
		#include <memory>
		#include <fnordmetric/query/query.h>
		#include <fnordmetric/sql/backends/csv/csvbackend.h>
		#include <fnordmetric/sql/executable.h>
		#include <fnordmetric/sql/parser.h>
		#include <fnordmetric/sql/queryplan.h>
		#include <fnordmetric/sql/queryplanbuilder.h>
		#include <fnordmetric/sql/resultlist.h>
		#include <fnordmetric/sql/tablerepository.h>
		#include <fnordmetric/sql_extensions/axisstatement.h>

+3 −3

Original line number	Diff line number	Diff line
		@@ -14,14 +14,14 @@
		#include <string>
		#include <vector>
		#include <memory>
		#include "../ui/canvas.h"
		#include <fnordmetric/sql/queryplannode.h>
		#include <fnordmetric/ui/canvas.h>

		namespace fnordmetric {
		namespace query {
		class TableRepository;
		class DrawStatement;
		class ASTNode;
		class Executable;
		class ResultList;

		class Query {
		@@ -80,7 +80,7 @@ protected:
		void importTable(ASTNode* statement, TableRepository* repo) const;

		//Drawable* makeDrawable(query::DrawStatement* stmt);
		std::vector<std::unique_ptr<Executable>> statements_;
		std::vector<std::unique_ptr<QueryPlanNode>> statements_;
		std::vector<std::unique_ptr<ResultList>> results_;
		std::vector<std::unique_ptr<ui::Canvas>> charts_;
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@

		#include <fnordmetric/query/query.h>
		#include <fnordmetric/query/queryservice.h>
		#include <fnordmetric/sql/executable.h>
		#include <fnordmetric/sql/queryplannode.h>
		#include <fnordmetric/sql/resultlist.h>
		#include <fnordmetric/sql/tablerepository.h>
		#include <fnordmetric/ui/svgtarget.h>

+4 −4

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		#include <assert.h>
		#include "token.h"
		#include "astnode.h"
		#include "executable.h"
		#include "queryplannode.h"
		#include "grouper.h"
		#include "symboltable.h"
		#include "compile.h"
		@@ -24,7 +24,7 @@
		namespace fnordmetric {
		namespace query {

		class GroupBy : public Executable {
		class GroupBy : public QueryPlanNode {
		public:

		GroupBy(
		@@ -32,7 +32,7 @@ public:
		CompiledExpression* select_expr,
		CompiledExpression* group_expr,
		size_t scratchpad_size,
		Executable* child) :
		QueryPlanNode* child) :
		columns_(std::move(columns)),
		select_expr_(select_expr),
		group_expr_(group_expr),
		@@ -113,7 +113,7 @@ protected:
		CompiledExpression* select_expr_;
		CompiledExpression* group_expr_;
		size_t scratchpad_size_;
		Executable* child_;
		QueryPlanNode* child_;
		std::unordered_map<std::string, Group> groups_;
		};