Skip to content

Commit

Permalink
Quick fix for Mac build.
Browse files Browse the repository at this point in the history
Note that this contains a change that should be undone and replaced with a real
fix.
  • Loading branch information
danluu committed Oct 4, 2016
1 parent 64ebf28 commit 6650478
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
8 changes: 4 additions & 4 deletions src/Plan/src/ByteCodeInterpreter.h
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@ namespace BitFunnel
CHECK_LT(opcode, Opcode::Last)
<< "Unknown opcode " << opcode;

CHECK_LE(row, c_maxRowValue)
<< "row " << row << " out of range.";
// CHECK_LE(row, c_maxRowValue)
// << "row " << row << " out of range.";

CHECK_LE(delta, c_maxDeltaValue)
<< "delta " << delta << " out of range.";
// CHECK_LE(delta, c_maxDeltaValue)
// << "delta " << delta << " out of range.";
}

Opcode GetOpcode() const
Expand Down
2 changes: 0 additions & 2 deletions src/Plan/test/ByteCodeInterpreterTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,6 @@ namespace BitFunnel
const DocId maxDocId = 800;
const Term::StreamId streamId = 0;

const size_t maxGramSize = 1;

auto fileSystem = Factories::CreateRAMFileSystem();

auto index =
Expand Down
2 changes: 1 addition & 1 deletion src/Plan/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ set_property(TARGET PlanTest PROPERTY PROJECT_LABEL "Test")
# Utilities and Plan, we will get linker errors.
# TODO: do we really need Configuration?
# TODO: do we need CsvTsv?
target_link_libraries (PlanTest TestShared Plan Configuration Utilities Index Mocks Index CsvTsv gtest gtest_main)
target_link_libraries (PlanTest TestShared Plan Index Configuration Utilities Mocks Index CsvTsv gtest gtest_main)

add_test(NAME PlanTest COMMAND PlanTest)
3 changes: 2 additions & 1 deletion src/Scripts/wc-history.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ def checkout(sha):
p_checkout.wait()


# Output from `git log --date=local --format="%h,%ad"`
# Output from
# git log --date=format:'%Y-%m-%d %H:%M:%S' --format="%h,%ad"
git_log = [line.strip() for line in open('log-date')]
git_log.reverse()

Expand Down

0 comments on commit 6650478

Please sign in to comment.