github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1127 - Remove the ebean.query.globallimit of 1 million "backstop"

Browse Source
This commit is contained in:
rob bygrave
2017-09-13 21:22:03 +12:00
parent 1e6678cbb4
commit c7a7651602
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/query/CQuery.java
+1 -6
View File
@@ -54,8 +54,6 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
private static final Logger logger = LoggerFactory.getLogger(CQuery.class);
private static final int GLOBAL_ROW_LIMIT = Integer.valueOf(System.getProperty("ebean.query.globallimit", "1000000"));
/**
* The resultSet rows read.
*/
@@ -149,8 +147,6 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
*/
private final BeanPropertyAssocMany<?> manyProperty;
private final int maxRowsLimit;
private DataReader dataReader;
/**
@@ -221,7 +217,6 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
this.logWhereSql = queryPlan.getLogWhereSql();
this.desc = request.getBeanDescriptor();
this.predicates = predicates;
this.maxRowsLimit = query.getMaxRows() > 0 ? query.getMaxRows() : GLOBAL_ROW_LIMIT;
this.help = createHelp(request);
this.collection = (help != null ? help.createEmptyNoParent() : null);
}
@@ -520,7 +515,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
protected boolean hasNext() throws SQLException {
synchronized (this) {
if (noMoreRows || cancelled || loadedBeanCount >= maxRowsLimit) {
if (noMoreRows || cancelled) {
return false;
}
if (hasNextCache) {