OODT-889 Fix topN
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/2a172a06 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/2a172a06 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/2a172a06 Branch: refs/heads/master Commit: 2a172a06d3e0a716f7bf9fd22d00785658940ee9 Parents: d757222 Author: Tom Barber <[email protected]> Authored: Tue Oct 13 16:19:40 2015 +0100 Committer: Tom Barber <[email protected]> Committed: Tue Oct 13 16:19:40 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/2a172a06/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b339ec3..b3ca821 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -14,6 +14,7 @@ Release 0.11 - Current Development * OODT-888 Replace += with StringBuilders to improve performance (magicaltrout) +* OODT-889 Fix TopN with Type Release 0.10 - 08/30/2015 * OODT-871 Issues with OODT 0.10 RC#1 (lewismc, mattmann) http://git-wip-us.apache.org/repos/asf/oodt/blob/2a172a06/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java index 98e0eb5..c91060e 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java @@ -728,7 +728,12 @@ public class LuceneCatalog implements Catalog { for (int pageNum = 1; pageNum < numPages + 1; pageNum++) { List<Product> pageProducts = paginateQuery(query, type, pageNum, null); - products.addAll(pageProducts); + if(n<=pageProducts.size()) { + products.addAll(pageProducts.subList(0, n)); + } + else{ + products.addAll(pageProducts); + } } return products;
