sql... (937222d5) · Commits · github_fork / Clip

cmake/CMakeLists.txt

+29 −30

Original line number	Diff line number	Diff line
		@@ -41,36 +41,35 @@ set(FNORDMETRIC_SOURCES
		$<TARGET_OBJECTS:fnord-sstable>
		../src/environment.cc
		../src/chartsql/queryendpoint.cc
		#stage/src/fnordmetric/util/assets.cc
		#stage/src/fnordmetric/sql/backends/csv/csvbackend.cc
		#stage/src/fnordmetric/sql/backends/csv/csvinputstream.cc
		#stage/src/fnordmetric/sql/backends/csv/csvtableref.cc
		#stage/src/fnordmetric/sql/backends/mysql/mysqlbackend.cc
		#stage/src/fnordmetric/sql/backends/mysql/mysqlconnection.cc
		#stage/src/fnordmetric/sql/backends/mysql/mysqltableref.cc
		#stage/src/fnordmetric/sql/expressions/aggregate.cc
		#stage/src/fnordmetric/sql/expressions/boolean.cc
		#stage/src/fnordmetric/sql/expressions/datetime.cc
		#stage/src/fnordmetric/sql/expressions/math.cc
		#stage/src/fnordmetric/sql/parser/astnode.cc
		#stage/src/fnordmetric/sql/parser/astutil.cc
		#stage/src/fnordmetric/sql/parser/parser.cc
		#stage/src/fnordmetric/sql/parser/token.cc
		#stage/src/fnordmetric/sql/parser/tokenize.cc
		#stage/src/fnordmetric/sql/runtime/compile.cc
		#stage/src/fnordmetric/sql/runtime/defaultruntime.cc
		#stage/src/fnordmetric/sql/runtime/execute.cc
		#stage/src/fnordmetric/sql/runtime/groupovertimewindow.cc
		#stage/src/fnordmetric/sql/runtime/orderby.cc
		#stage/src/fnordmetric/sql/runtime/importstatement.cc
		#stage/src/fnordmetric/sql/runtime/queryplan.cc
		#stage/src/fnordmetric/sql/runtime/queryplanbuilder.cc
		#stage/src/fnordmetric/sql/runtime/queryplannode.cc
		#stage/src/fnordmetric/sql/runtime/runtime.cc
		#stage/src/fnordmetric/sql/runtime/symboltable.cc
		#stage/src/fnordmetric/sql/runtime/tablerepository.cc
		#stage/src/fnordmetric/sql/runtime/tablescan.cc
		#stage/src/fnordmetric/sql/svalue.cc
		../src/sql/backends/csv/csvbackend.cc
		../src/sql/backends/csv/csvinputstream.cc
		../src/sql/backends/csv/csvtableref.cc
		../src/sql/backends/mysql/mysqlbackend.cc
		../src/sql/backends/mysql/mysqlconnection.cc
		../src/sql/backends/mysql/mysqltableref.cc
		../src/sql/expressions/aggregate.cc
		../src/sql/expressions/boolean.cc
		../src/sql/expressions/datetime.cc
		../src/sql/expressions/math.cc
		../src/sql/parser/astnode.cc
		../src/sql/parser/astutil.cc
		../src/sql/parser/parser.cc
		../src/sql/parser/token.cc
		../src/sql/parser/tokenize.cc
		../src/sql/runtime/compile.cc
		../src/sql/runtime/defaultruntime.cc
		../src/sql/runtime/execute.cc
		../src/sql/runtime/groupovertimewindow.cc
		../src/sql/runtime/orderby.cc
		../src/sql/runtime/importstatement.cc
		../src/sql/runtime/queryplan.cc
		../src/sql/runtime/queryplanbuilder.cc
		../src/sql/runtime/queryplannode.cc
		../src/sql/runtime/runtime.cc
		../src/sql/runtime/symboltable.cc
		../src/sql/runtime/tablerepository.cc
		../src/sql/runtime/tablescan.cc
		../src/sql/svalue.cc
		#stage/src/fnordmetric/sql_extensions/areachartbuilder.cc
		#stage/src/fnordmetric/sql_extensions/barchartbuilder.cc
		#stage/src/fnordmetric/sql_extensions/linechartbuilder.cc

src/sql/backends/csv/csvbackend.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		*/
		#include <memory>
		#include <fnord-base/exception.h>
		#include <fnord/io/inputstream.h>
		#include <fnord-base/io/inputstream.h>
		#include <sql/backends/csv/csvbackend.h>
		#include <sql/backends/csv/csvtableref.h>
		#include <sql/parser/astnode.h>

src/sql/backends/csv/csvinputstream.cc

+4 −4

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@
		#include <fcntl.h>
		#include "csvinputstream.h"
		#include "fnord-base/exception.h"
		#include "fnord/io/inputstream.h"
		#include "fnord-base/io/inputstream.h"

		namespace fnordmetric {
		namespace query {
		@@ -23,7 +23,7 @@ std::unique_ptr<CSVInputStream> CSVInputStream::openFile(
		char column_seperator /* = ',' */,
		char row_seperator /* = '\n' */,
		char quote_char /* = '"' */) {
		auto file = fnord::io::FileInputStream::openFile(file_path);
		auto file = fnord::FileInputStream::openFile(file_path);
		file->readByteOrderMark();

		auto csv_file = new CSVInputStream(
		@@ -36,7 +36,7 @@ std::unique_ptr<CSVInputStream> CSVInputStream::openFile(
		}

		CSVInputStream::CSVInputStream(
		std::unique_ptr<fnord::io::RewindableInputStream>&& input_stream,
		std::unique_ptr<fnord::RewindableInputStream>&& input_stream,
		char column_seperator /* = ',' */,
		char row_seperator /* = '\n' */,
		char quote_char /* = '"' */) :
		@@ -94,7 +94,7 @@ void CSVInputStream::rewind() {
		input_->rewind();
		}

		const fnord::io::RewindableInputStream& CSVInputStream::getInputStream()
		const fnord::RewindableInputStream& CSVInputStream::getInputStream()
		const {
		return *input_;
		}

src/sql/backends/mysql/mysqlconnection.cc

+2 −5

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@
		* <http://www.gnu.org/licenses/>.
		*/
		#include <environment.h>
		#include <fnord-base/logging.h>
		#include <sql/backends/mysql/mysqlconnection.h>

		namespace fnordmetric {
		@@ -150,11 +151,7 @@ void MySQLConnection::executeQuery(
		std::function<bool (const std::vector<std::string>&)> row_callback) {
		#ifdef FNORD_ENABLE_MYSQL
		if (env()->verbose()) {
		fnord::util::LogEntry entry;
		entry.append("__severity__", "DEBUG");
		entry.append("__message__", "Executing MySQL query");
		entry.append("query", query);
		env()->logger()->log(entry);
		fnord::logDebug("fnordmetric", "Executing MySQL query: $0", query);
		}

		MYSQL_RES* result = nullptr;

Admin message