move backends into query namespace (59e2e8a9) · Commits · github_fork / Clip

CMakeLists.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ set(FNORDMETRIC_QUERY_SOURCES
		src/query/tokenize.cc)

		set(FNORDMETRIC_CSV_BACKEND_SOURCES
		src/backends/csv/csvinputstream.cc)
		src/query/backends/csv/csvinputstream.cc)

		include_directories(./src)
		set(CMAKE_CXX_FLAGS "-std=c++0x -stdlib=libc++")
		@@ -63,4 +63,4 @@ add_executable(tests/test-input-stream
		add_executable(tests/test-csv-backend
		${FNORDMETRIC_UI_SOURCES}
		${FNORDMETRIC_CSV_BACKEND_SOURCES}
		src/backends/csv/csvbackend_test.cc)
		src/query/backends/csv/csvbackend_test.cc)

+4 −6

Original line number	Diff line number	Diff line
		@@ -7,15 +7,12 @@
		#include <stdlib.h>
		#include <stdio.h>
		#include <string.h>
		#include <assert.h>
		#include <sys/fcntl.h>
		#include <unistd.h>
		#include "../../../util/runtimeexception.h"
		#include "../../../util/unittest.h"
		#include "csvinputstream.h"
		//#include "csv_backend.h"
		#include "../../util/runtimeexception.h"
		#include "../../util/unittest.h"

		using namespace fnordmetric::csv_backend;
		using namespace fnordmetric::query::csv_backend;

		UNIT_TEST(CSVInputStreamTest);

		@@ -87,3 +84,4 @@ TEST_CASE(CSVInputStreamTest, TestReadSimpleRowsEOF, [] () {

		EXPECT_EQ(num_rows, 192);
		});

+4 −2

Original line number	Diff line number	Diff line
		@@ -8,10 +8,11 @@
		#include <unistd.h>
		#include <fcntl.h>
		#include "csvinputstream.h"
		#include "../../util/inputstream.h"
		#include "../../util/runtimeexception.h"
		#include "../../../util/inputstream.h"
		#include "../../../util/runtimeexception.h"

		namespace fnordmetric {
		namespace query {
		namespace csv_backend {

		std::unique_ptr<CSVInputStream> CSVInputStream::openFile(
		@@ -77,3 +78,4 @@ bool CSVInputStream::readNextRow(std::vector<std::string>* target) {

		}
		}
		}

+3 −2

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		/**
		* This file is part of the "FnordMetric" project
		* Copyright (c) 2014 Paul Asmuth, Google Inc.
		*
		* Licensed under the MIT license (see LICENSE).
		*/
		#ifndef _FNORDMETRIC_CSVTABLEREF_H
		#define _FNORDMETRIC_CSVTABLEREF_H
		#include <string>
		#include <vector>
		#include <memory>

		namespace fnordmetric {
		namespace csv_backend {

		class CSVTableRef : public fnordmetric::query::TableRef {
		public:

		int getColumnIndex(const std::string& name) override;
		void executeScan(TableScan* scan) override;
		};

		}
		}
		#endif;