all tests pass on gcc-4.8 (e6f4f051) · Commits · github_fork / Clip

fnordmetric-core/build/cmake/CMakeLists.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -142,9 +142,9 @@ include_directories(stage/src)
		include_directories(stage/assets)

		if(APPLE)
		set(CMAKE_CXX_FLAGS "-std=c++0x -stdlib=libc++")
		set(CMAKE_CXX_FLAGS "-std=c++0x -stdlib=libc++ -lstdc++")
		else()
		set(CMAKE_CXX_FLAGS "-std=c++0x")
		set(CMAKE_CXX_FLAGS "-std=c++0x -lstdc++")
		endif()

		# libfnord

fnordmetric-core/src/sstable/cursor.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,14 +16,14 @@ Cursor::Cursor() {}

		Cursor::~Cursor() {}

		std::string Cursor::getKey() {
		std::string Cursor::getKeyString() {
		void* data;
		size_t size;
		getKey(&data, &size);
		return std::string((char *) data, size);
		}

		std::string Cursor::getData() {
		std::string Cursor::getDataString() {
		void* data;
		size_t size;
		getData(&data, &size);

fnordmetric-core/src/sstable/cursor.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -29,9 +29,9 @@ public:
		virtual bool valid() = 0;

		virtual void getKey(void** data, size_t* size) = 0;
		std::string getKey();
		virtual std::string getKeyString();
		virtual void getData(void** data, size_t* size) = 0;
		std::string getData();
		virtual std::string getDataString();

		virtual size_t position() const = 0;

fnordmetric-core/src/sstable/sstable_test.cc

+16 −16

Original line number	Diff line number	Diff line
		@@ -39,23 +39,23 @@ TEST_CASE(SSTableTest, TestSSTableWriter, [] () {
		tbl->appendRow("key3", "value3");

		auto cursor = tbl->getCursor();
		EXPECT_EQ(cursor->getKey(), "key1");
		EXPECT_EQ(cursor->getData(), "value1");
		EXPECT_EQ(cursor->getKeyString(), "key1");
		EXPECT_EQ(cursor->getDataString(), "value1");
		EXPECT_EQ(cursor->next(), true);

		EXPECT_EQ(cursor->getKey(), "key2");
		EXPECT_EQ(cursor->getData(), "value2");
		EXPECT_EQ(cursor->getKeyString(), "key2");
		EXPECT_EQ(cursor->getDataString(), "value2");
		EXPECT_EQ(cursor->next(), true);

		EXPECT_EQ(cursor->getKey(), "key3");
		EXPECT_EQ(cursor->getData(), "value3");
		EXPECT_EQ(cursor->getKeyString(), "key3");
		EXPECT_EQ(cursor->getDataString(), "value3");
		EXPECT_EQ(cursor->next(), false);

		tbl->appendRow("key4", "value4");

		EXPECT_EQ(cursor->next(), true);
		EXPECT_EQ(cursor->getKey(), "key4");
		EXPECT_EQ(cursor->getData(), "value4");
		EXPECT_EQ(cursor->getKeyString(), "key4");
		EXPECT_EQ(cursor->getDataString(), "value4");
		EXPECT_EQ(cursor->next(), false);

		tbl->finalize();
		@@ -82,23 +82,23 @@ TEST_CASE(SSTableTest, TestSSTableWriterWithIndexes, [] () {
		tbl->appendRow("key3", "value3");

		auto cursor = tbl->getCursor();
		EXPECT_EQ(cursor->getKey(), "key1");
		EXPECT_EQ(cursor->getData(), "value1");
		EXPECT_EQ(cursor->getKeyString(), "key1");
		EXPECT_EQ(cursor->getDataString(), "value1");
		EXPECT_EQ(cursor->next(), true);

		EXPECT_EQ(cursor->getKey(), "key2");
		EXPECT_EQ(cursor->getData(), "value2");
		EXPECT_EQ(cursor->getKeyString(), "key2");
		EXPECT_EQ(cursor->getDataString(), "value2");
		EXPECT_EQ(cursor->next(), true);

		EXPECT_EQ(cursor->getKey(), "key3");
		EXPECT_EQ(cursor->getData(), "value3");
		EXPECT_EQ(cursor->getKeyString(), "key3");
		EXPECT_EQ(cursor->getDataString(), "value3");
		EXPECT_EQ(cursor->next(), false);

		tbl->appendRow("key4", "value4");

		EXPECT_EQ(cursor->next(), true);
		EXPECT_EQ(cursor->getKey(), "key4");
		EXPECT_EQ(cursor->getData(), "value4");
		EXPECT_EQ(cursor->getKeyString(), "key4");
		EXPECT_EQ(cursor->getDataString(), "value4");
		EXPECT_EQ(cursor->next(), false);

		tbl->finalize();

Admin message