yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-08-26 10:06:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify V2 dataset API pagination params

Browse Source
This commit is contained in:
ywang5 2018-03-06 12:25:24 -08:00
parent 0c76597fa7
commit d41a57d375
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wherehows-frontend/app/controllers/api/v2/Dataset.java
View File

@ -40,7 +40,7 @@ import wherehows.models.view.DatasetSchema;
import wherehows.models.view.DatasetView; import wherehows.models.view.DatasetView;
import wherehows.models.view.DsComplianceSuggestion; import wherehows.models.view.DsComplianceSuggestion;
import static controllers.api.v1.Dataset.getDatasetUrnByIdOrCache; import static controllers.api.v1.Dataset.*;
import static utils.Dataset.*; import static utils.Dataset.*;
@ -90,11 +90,14 @@ public class Dataset extends Controller {
public static Promise<Result> listDatasets(@Nullable String platform, @Nonnull String prefix) { public static Promise<Result> listDatasets(@Nullable String platform, @Nonnull String prefix) {
try { try {
int start = NumberUtils.toInt(request().getQueryString("start"), 0);
int count = NumberUtils.toInt(request().getQueryString("count"), _DEFAULT_PAGE_SIZE);
int page = NumberUtils.toInt(request().getQueryString("page"), 0); int page = NumberUtils.toInt(request().getQueryString("page"), 0);
int start = page * _DEFAULT_PAGE_SIZE; // 'start' takes precedence over 'page'
int startIndex = (request().getQueryString("start") == null && page > 0) ? page * _DEFAULT_PAGE_SIZE : start;
return Promise.promise( return Promise.promise(
() -> ok(Json.toJson(DATASET_VIEW_DAO.listDatasets(platform, "PROD", prefix, start, _DEFAULT_PAGE_SIZE)))); () -> ok(Json.toJson(DATASET_VIEW_DAO.listDatasets(platform, "PROD", prefix, startIndex, count))));
} catch (Exception e) { } catch (Exception e) {
Logger.error("Fail to list datasets", e); Logger.error("Fail to list datasets", e);
return Promise.promise(() -> internalServerError(errorResponse(e))); return Promise.promise(() -> internalServerError(errorResponse(e)));