Skip to content

fix(Query): scan returns same object repeatly #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2022
Merged

fix(Query): scan returns same object repeatly #674

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 29 additions & 34 deletions src/query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,45 +438,40 @@ module.exports = function(AV) {
}
if (orderedBy) condition.scan_key = orderedBy;
if (batchSize) condition.limit = batchSize;
let promise = Promise.resolve([]);
let cursor;
let endReached = false;
let remainResults = [];
return {
next: () => {
promise = promise.then(remainResults => {
if (endReached) return [];
if (remainResults.length > 1) return remainResults;
// no cursor means we have reached the end
// except for the first time
if (!cursor && remainResults.length !== 0) {
endReached = true;
return remainResults;
if (remainResults.length) {
return Promise.resolve({
done: false,
value: remainResults.shift(),
});
}
if (cursor === null) {
return Promise.resolve({ done: true });
}
return _request(
'scan/classes',
this.className,
null,
'GET',
cursor ? _.extend({}, condition, { cursor }) : condition,
authOptions
).then(response => {
cursor = response.cursor;
if (response.results.length) {
const results = this._parseResponse(response);
results.forEach(result => remainResults.push(result));
}
// when only 1 item left in queue
// start the next request to see if it is the last one
return _request(
'scan/classes',
this.className,
null,
'GET',
cursor ? _.extend({}, condition, { cursor }) : condition,
authOptions
)
.then(response => {
cursor = response.cursor;
return this._parseResponse(response);
})
.then(results => {
if (!results.length) endReached = true;
return remainResults.concat(results);
});
if (cursor === null && remainResults.length === 0) {
return { done: true };
}
return {
done: false,
value: remainResults.shift(),
};
});
return promise
.then(remainResults => remainResults.shift())
.then(result => ({
value: result,
done: result === undefined,
}));
},
};
},
Expand Down