Commit 49836814 authored by Kai-Uwe Sattler's avatar Kai-Uwe Sattler
Browse files

merge

parents f3c6cc5b dfd9c89b
......@@ -99,7 +99,7 @@ if(USE_ROCKSDB_TABLE)
# RocksDB key-value store
download_project(PROJ rocksdb
GIT_REPOSITORY https://github.com/facebook/rocksdb
GIT_TAG master
GIT_TAG v5.1.4
UPDATE_DISCONNECTED 1
QUIET
)
......
......@@ -46,18 +46,23 @@ option(BUILD_TEST_CASES
ON
)
# Build benchmarks (note: requires to set BUILD_GOOGLE_BEMCH to ON)
option(BUILD_BENCHMARKS
"build benchmarks for pipefabric"
#Build google benchmark library
option(BUILD_GOOGLE_BENCH
"build google benchmark"
ON
)
#Build google benchmark library with test
option(BUILD_GOOGLE_BENCH
"build google benchmark"
# Build benchmark test
option(BUILD_BENCHMARKS
"build benchmarks for pipefabric"
ON
)
# Benchmark test requires benchmark library
if (BUILD_BENCHMARKS)
set(BUILD_GOOGLE_BENCH ON)
endif()
# Force using intel compiler
#include(CMakeForceCompiler)
#CMAKE_FORCE_C_COMPILER(icc "Intel C Compiler")
......
include(../../cmake/Testing.cmake.in)
if (BUILD_BENCHMARKS)
if (BUILD_GOOGLE_BENCH)
do_test(TopologyBenchmarks)
do_test(MemoryBenchmarks)
endif()
do_test(TopologyBenchmarks)
endif()
......@@ -26,6 +26,7 @@
#include <string>
#include <thread>
#include <vector>
#include <mutex>
#include <boost/unordered/unordered_map.hpp>
......@@ -105,8 +106,9 @@ class Tuplifier
Tuplifier(TimestampExtractorFunc func,
const std::initializer_list<std::string>& predList, TuplifierParams::TuplifyMode m, unsigned int ws = 0) :
Tuplifier(predList, m, ws),
mTimestampExtractor(func) {}
Tuplifier(predList, m, ws) {
mTimestampExtractor = func;
}
~Tuplifier() {}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment