Bug fixed: atVectorClock not working correctly
This commit is contained in:
parent
75064ad4c0
commit
6ab35a666c
@ -110,7 +110,7 @@ function processTagFromUser(data) {
|
|||||||
function checkIfRequestSatisfy(request, data) {
|
function checkIfRequestSatisfy(request, data) {
|
||||||
if (!request || request.mostRecent || request.receiverID !== data.receiverID)
|
if (!request || request.mostRecent || request.receiverID !== data.receiverID)
|
||||||
return false;
|
return false;
|
||||||
if (request.atKey && request.atKey !== data.vectorClock)
|
if (request.atVectorClock && request.atVectorClock !== data.vectorClock)
|
||||||
return false;
|
return false;
|
||||||
if (request.lowerVectorClock && request.lowerVectorClock > data.vectorClock)
|
if (request.lowerVectorClock && request.lowerVectorClock > data.vectorClock)
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@ -237,11 +237,11 @@ function Database(user, password, dbname, host = 'localhost') {
|
|||||||
db.searchData = function(snID, request) {
|
db.searchData = function(snID, request) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
let conditionArr = [];
|
let conditionArr = [];
|
||||||
if (request.lowerVectorClock || request.upperVectorClock || request.atKey) {
|
if (request.lowerVectorClock || request.upperVectorClock || request.atVectorClock) {
|
||||||
if (request.lowerVectorClock && request.upperVectorClock)
|
if (request.atVectorClock)
|
||||||
|
conditionArr.push(`${H_struct.VECTOR_CLOCK} = '${request.atVectorClock}'`);
|
||||||
|
else if (request.lowerVectorClock && request.upperVectorClock)
|
||||||
conditionArr.push(`${H_struct.VECTOR_CLOCK} BETWEEN '${request.lowerVectorClock}' AND '${request.upperVectorClock}'`);
|
conditionArr.push(`${H_struct.VECTOR_CLOCK} BETWEEN '${request.lowerVectorClock}' AND '${request.upperVectorClock}'`);
|
||||||
else if (request.atKey)
|
|
||||||
conditionArr.push(`${H_struct.VECTOR_CLOCK} = '${request.atKey}'`);
|
|
||||||
else if (request.lowerVectorClock)
|
else if (request.lowerVectorClock)
|
||||||
conditionArr.push(`${H_struct.VECTOR_CLOCK} >= '${request.lowerVectorClock}'`);
|
conditionArr.push(`${H_struct.VECTOR_CLOCK} >= '${request.lowerVectorClock}'`);
|
||||||
else if (request.upperVectorClock)
|
else if (request.upperVectorClock)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user