andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed negative numbers comparison in DocumentDB

Browse Source
This commit is contained in:
stash93 2015-01-08 01:03:51 +03:00
parent 9ef59a09a5
commit 4b57d9a820
2 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utilities/document/document_db.cc
View File

@ -312,8 +312,11 @@ bool EncodeJSONPrimitive(const JSONDocument& json, std::string* dst) {
break; break;
case JSONDocument::kInt64: case JSONDocument::kInt64:
dst->push_back(kInt64); dst->push_back(kInt64);
// TODO(icanadi) oops, this will not work correctly for negative numbers {
PutFixed64(dst, static_cast<uint64_t>(json.GetInt64())); auto val = json.GetInt64();
dst->push_back((val < 0) ? '0' : '1');
PutFixed64(dst, static_cast<uint64_t>(val));
}
break; break;
case JSONDocument::kString: case JSONDocument::kString:
dst->push_back(kString); dst->push_back(kString);

44
utilities/document/document_db_test.cc
View File

@ -164,7 +164,9 @@ TEST(DocumentDBTest, ComplexQueryTest) {
"{'_id': 8, 'job_name': 'rock', 'priority': 3, 'progress': 93.24}", "{'_id': 8, 'job_name': 'rock', 'priority': 3, 'progress': 93.24}",
"{'_id': 9, 'job_name': 'steady', 'priority': 3, 'progress': 9.1}", "{'_id': 9, 'job_name': 'steady', 'priority': 3, 'progress': 9.1}",
"{'_id': 10, 'job_name': 'white', 'priority': 1, 'progress': 61.4}", "{'_id': 10, 'job_name': 'white', 'priority': 1, 'progress': 61.4}",
"{'_id': 11, 'job_name': 'who', 'priority': 4, 'progress': 39.41}", }; "{'_id': 11, 'job_name': 'who', 'priority': 4, 'progress': 39.41}",
"{'_id': 12, 'job_name': 'who', 'priority': -1, 'progress': 39.42}",
"{'_id': 13, 'job_name': 'who', 'priority': -2, 'progress': 39.42}", };
// add index on the fly! // add index on the fly!
CreateIndexes({job_name_index}); CreateIndexes({job_name_index});
@ -185,6 +187,15 @@ TEST(DocumentDBTest, ComplexQueryTest) {
AssertCursorIDs(cursor.get(), {4, 8}); AssertCursorIDs(cursor.get(), {4, 8});
} }
// -1 <= priority <= 1, index priority
{
std::unique_ptr<JSONDocument> query(Parse(
"[{'$filter': {'priority': {'$lte': 1, '$gte': -1},"
" '$index': 'priority'}}]"));
std::unique_ptr<Cursor> cursor(db_->Query(ReadOptions(), *query));
AssertCursorIDs(cursor.get(), {6, 10, 12});
}
// 2 < priority < 4 AND progress > 10.0, index progress // 2 < priority < 4 AND progress > 10.0, index progress
{ {
std::unique_ptr<JSONDocument> query(Parse( std::unique_ptr<JSONDocument> query(Parse(
@ -209,7 +220,7 @@ TEST(DocumentDBTest, ComplexQueryTest) {
"[{'$filter': {'progress': {'$gt': 5.0, '$gte': 35.0, '$lt': 65.5}, " "[{'$filter': {'progress': {'$gt': 5.0, '$gte': 35.0, '$lt': 65.5}, "
"'$index': 'progress'}}]")); "'$index': 'progress'}}]"));
std::unique_ptr<Cursor> cursor(db_->Query(ReadOptions(), *query)); std::unique_ptr<Cursor> cursor(db_->Query(ReadOptions(), *query));
AssertCursorIDs(cursor.get(), {2, 5, 10, 11}); AssertCursorIDs(cursor.get(), {2, 5, 10, 11, 12, 13});
} }
// 2 < priority <= 4, index priority // 2 < priority <= 4, index priority
@ -244,6 +255,35 @@ TEST(DocumentDBTest, ComplexQueryTest) {
ASSERT_OK(db_->Update(ReadOptions(), WriteOptions(), *query, *update)); ASSERT_OK(db_->Update(ReadOptions(), WriteOptions(), *query, *update));
} }
// priority < 0
{
std::unique_ptr<JSONDocument> query(
Parse("[{'$filter': {'priority': {'$lt': 0}, '$index': 'priority'}}]"));
std::unique_ptr<Cursor> cursor(db_->Query(ReadOptions(), *query));
ASSERT_OK(cursor->status());
AssertCursorIDs(cursor.get(), {12, 13});
}
// -2 < priority < 0
{
std::unique_ptr<JSONDocument> query(
Parse("[{'$filter': {'priority': {'$gt': -2, '$lt': 0},"
" '$index': 'priority'}}]"));
std::unique_ptr<Cursor> cursor(db_->Query(ReadOptions(), *query));
ASSERT_OK(cursor->status());
AssertCursorIDs(cursor.get(), {12});
}
// -2 <= priority < 0
{
std::unique_ptr<JSONDocument> query(
Parse("[{'$filter': {'priority': {'$gte': -2, '$lt': 0},"
" '$index': 'priority'}}]"));
std::unique_ptr<Cursor> cursor(db_->Query(ReadOptions(), *query));
ASSERT_OK(cursor->status());
AssertCursorIDs(cursor.get(), {12, 13});
}
// 4 < priority // 4 < priority
{ {
std::unique_ptr<JSONDocument> query( std::unique_ptr<JSONDocument> query(