diff --git a/services/reminder/src/reminder_datashare_helper.cpp b/services/reminder/src/reminder_datashare_helper.cpp index 66c2b07a384bcd09b482d527b6931dcb7a8f13f8..0d31116f94049a9ca1f33db464eeae16d121be19 100644 --- a/services/reminder/src/reminder_datashare_helper.cpp +++ b/services/reminder/src/reminder_datashare_helper.cpp @@ -139,16 +139,12 @@ bool ReminderDataShareHelper::Query(std::map> return false; } - bool isAtLastRow = false; - int32_t ret = resultSet->IsAtLastRow(isAtLastRow); - while (ret == 0 && !isAtLastRow) { - resultSet->GoToNextRow(); + while (resultSet->GoToNextRow() == NativeRdb::E_OK) { sptr reminder = CreateReminder(resultSet); if (reminder == nullptr) { continue; } reminders[reminder->GetIdentifier()] = reminder; - ret = resultSet->IsAtLastRow(isAtLastRow); } ReleaseDataShareHelper(helper); ANSR_LOGD("Query size: %{public}d.", static_cast(reminders.size())); diff --git a/services/reminder/src/reminder_store.cpp b/services/reminder/src/reminder_store.cpp index a1e356a8ae2fe65b645059935153367fcf366987..ca32a429f593fc6bab15b118018a5852515c45bb 100644 --- a/services/reminder/src/reminder_store.cpp +++ b/services/reminder/src/reminder_store.cpp @@ -177,10 +177,7 @@ std::vector> ReminderStore::ReminderStoreDataCallBack::Get return reminders; } - bool isLastRow = false; - queryResult->IsAtLastRow(isLastRow); - while (!isLastRow) { - queryResult->GoToNextRow(); + while (queryResult->GoToNextRow() == NativeRdb::E_OK) { int32_t reminderId; int32_t reminderType; GetInt32Val(queryResult, ReminderTable::REMINDER_ID, reminderId); @@ -210,7 +207,6 @@ std::vector> ReminderStore::ReminderStoreDataCallBack::Get if (reminderReq != nullptr) { reminders.push_back(reminderReq); } - queryResult->IsAtLastRow(isLastRow); } return reminders; } @@ -758,15 +754,11 @@ std::vector> ReminderStore::GetReminders(const std::string if (queryResultSet == nullptr) { return reminders; } - bool isAtLastRow = false; - int32_t ret = queryResultSet->IsAtLastRow(isAtLastRow); - while (ret == NativeRdb::E_OK && !isAtLastRow) { - queryResultSet->GoToNextRow(); + while (queryResultSet->GoToNextRow() == NativeRdb::E_OK) { sptr reminder = BuildReminder(queryResultSet); if (reminder != nullptr) { reminders.push_back(reminder); } - ret = queryResultSet->IsAtLastRow(isAtLastRow); } ANSR_LOGD("Size=%{public}zu", reminders.size()); return reminders;