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

#717 - Remove findIterate() ... migrate to findEach() or findEachWhile()

Browse Source
This commit is contained in:
Robin Bygrave
2016-05-20 22:38:07 +12:00
parent 11d623cb69
commit 662be92a16
20 changed files with 99 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java
-5
View File
@@ -445,11 +445,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
return null;
}
@Override
public <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction) {
return null;
}
@Override
public <T> void findEach(Query<T> query, QueryEachConsumer<T> consumer, Transaction transaction) {
src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java
+10 -12
View File
@@ -3,12 +3,14 @@ package com.avaje.tests.query;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.Query;
import com.avaje.ebean.QueryIterator;
import com.avaje.ebean.QueryEachConsumer;
import com.avaje.tests.model.basic.Customer;
import com.avaje.tests.model.basic.Order;
import com.avaje.tests.model.basic.ResetBasicData;
import org.junit.Test;
import java.util.concurrent.atomic.AtomicInteger;
import static org.junit.Assert.assertEquals;
public class TestOneToManyCorrectGrouping extends BaseTestCase {
@@ -24,21 +26,17 @@ public class TestOneToManyCorrectGrouping extends BaseTestCase {
.where().le("id", 2)
.query();
QueryIterator<Customer> customerQueryIterator = customerQuery.findIterate();
final AtomicInteger count = new AtomicInteger();
try {
int count = 0;
while (customerQueryIterator.hasNext()) {
Customer customer = customerQueryIterator.next();
customerQuery.findEach(new QueryEachConsumer<Customer>() {
@Override
public void accept(Customer customer) {
for (Order order : customer.getOrders()) {
order.getId();
}
count++;
count.incrementAndGet();
}
assertEquals(EXPECTED_ITERATIONS, count);
} finally {
customerQueryIterator.close();
}
});
assertEquals(EXPECTED_ITERATIONS, count.get());
}
}
src/test/java/com/avaje/tests/query/TestQueryFindIterate.java
+63 -80
View File
@@ -12,6 +12,7 @@ import com.avaje.tests.model.basic.Customer;
import com.avaje.tests.model.basic.ResetBasicData;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
@@ -31,20 +32,16 @@ public class TestQueryFindIterate extends BaseTestCase {
//.fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id")
.setMaxRows(2);
int count = 0;
final AtomicInteger count = new AtomicInteger();
QueryIterator<Customer> it = query.findIterate();
try {
while (it.hasNext()) {
Customer customer = it.next();
customer.hashCode();
count++;
query.findEach(new QueryEachConsumer<Customer>() {
@Override
public void accept(Customer bean) {
count.incrementAndGet();
}
} finally {
it.close();
}
});
assertEquals(2, count);
assertEquals(2, count.get());
}
@Test
@@ -52,25 +49,20 @@ public class TestQueryFindIterate extends BaseTestCase {
ResetBasicData.reset();
QueryIterator<Order> queryIterator = Ebean.find(Order.class)
Ebean.find(Order.class)
//.select("orderDate")
.where().gt("id",0).le("id",10)
.findIterate();
try {
while (queryIterator.hasNext()) {
Order order = queryIterator.next();
Customer customer = order.getCustomer();
// invoke lazy loading on customer, order details and order shipments
order.getId();
customer.getName();
order.getDetails().size();
order.getShipments().size();
}
} finally {
queryIterator.close();
}
.findEach(new QueryEachConsumer<Order>() {
@Override
public void accept(Order order) {
Customer customer = order.getCustomer();
// invoke lazy loading on customer, order details and order shipments
order.getId();
customer.getName();
order.getDetails().size();
order.getShipments().size();
}
});
}
@@ -81,26 +73,22 @@ public class TestQueryFindIterate extends BaseTestCase {
LoggedSqlCollector.start();
QueryIterator<Order> queryIterator = Ebean.find(Order.class)
.setLazyLoadBatchSize(10)
.select("status, orderDate")
.fetch("customer", "name")
.where().gt("id",0).le("id",10)
.setUseCache(false)
.findIterate();
Ebean.find(Order.class)
.setLazyLoadBatchSize(10)
.select("status, orderDate")
.fetch("customer", "name")
.where().gt("id",0).le("id",10)
.setUseCache(false)
.findEach(new QueryEachConsumer<Order>() {
@Override
public void accept(Order order) {
Customer customer = order.getCustomer();
customer.getName();
order.getDetails().size();
order.getShipments().size();
}
});
try {
while (queryIterator.hasNext()) {
Order order = queryIterator.next();
Customer customer = order.getCustomer();
customer.getName();
order.getDetails().size();
order.getShipments().size();
}
} finally {
queryIterator.close();
}
List<String> loggedSql = LoggedSqlCollector.stop();
@@ -123,29 +111,24 @@ public class TestQueryFindIterate extends BaseTestCase {
Ebean.getServerCacheManager().getBeanCache(OrderShipment.class).clear();
Ebean.getServerCacheManager().getQueryCache(OrderShipment.class).clear();
QueryIterator<Order> queryIterator = Ebean.find(Order.class)
.setLazyLoadBatchSize(10)
.setUseCache(false)
.select("status, orderDate")
.fetch("customer", "name")
.fetch("details")
.where().gt("id",0).le("id",10)
.order().asc("id")
.findIterate();
try {
while (queryIterator.hasNext()) {
Order order = queryIterator.next();
Customer customer = order.getCustomer();
order.getId();
customer.getName();
order.getDetails().size();
order.getShipments().size();
}
} finally {
queryIterator.close();
}
Ebean.find(Order.class)
.setLazyLoadBatchSize(10)
.setUseCache(false)
.select("status, orderDate")
.fetch("customer", "name")
.fetch("details")
.where().gt("id",0).le("id",10)
.order().asc("id")
.findEach(new QueryEachConsumer<Order>() {
@Override
public void accept(Order order) {
Customer customer = order.getCustomer();
order.getId();
customer.getName();
order.getDetails().size();
order.getShipments().size();
}
});
List<String> loggedSql = LoggedSqlCollector.stop();
@@ -168,8 +151,12 @@ public class TestQueryFindIterate extends BaseTestCase {
.setMaxRows(2);
// this throws an exception immediately
QueryIterator<Customer> it = query.findIterate();
it.close();
query.findEach(new QueryEachConsumer<Customer>() {
@Override
public void accept(Customer bean) {
}
});
if (!server.getName().equals("h2")) {
// MySql allows the query with type conversion?
@@ -191,17 +178,13 @@ public class TestQueryFindIterate extends BaseTestCase {
.where().gt("id", 0)
.setMaxRows(2);
QueryIterator<Customer> it = query.findIterate();
try {
while (it.hasNext()) {
Customer customer = it.next();
query.findEach(new QueryEachConsumer<Customer>() {
@Override
public void accept(Customer customer) {
if (customer != null) {
throw new IllegalStateException("cause an exception");
}
}
} finally {
it.close();
}
});
}
}
src/test/java/com/avaje/tests/query/other/TestFindIterateHeapDump.java
+18 -28
View File
@@ -11,7 +11,6 @@ import org.junit.Test;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.EbeanServer;
import com.avaje.ebean.QueryIterator;
import com.avaje.ebean.Transaction;
import com.avaje.tests.model.basic.EBasic;
import com.sun.management.HotSpotDiagnosticMXBean;
@@ -52,33 +51,24 @@ public class TestFindIterateHeapDump extends BaseTestCase {
transaction.end();
}
QueryIterator<EBasic> iterate = server.find(EBasic.class).findIterate();
iterate.hashCode();
try {
// Intentionally not iterating through the iterator to
// try {
// while (iterate.hasNext()) {
// EBasic eBasic = iterate.next();
// eBasic.getDescription();
// }
// } finally {
// iterate.close();
// }
String fileName = "heap-dump6.snapshot";
File file = new File(fileName);
if (file.exists())
file.delete();
dumpHeap(fileName, true);
} finally {
iterate.close();
}
// Intentionally not iterating through the iterator to
// try {
// while (iterate.hasNext()) {
// EBasic eBasic = iterate.next();
// eBasic.getDescription();
// }
// } finally {
// iterate.close();
// }
String fileName = "heap-dump6.snapshot";
File file = new File(fileName);
if (file.exists())
file.delete();
dumpHeap(fileName, true);
}
static void dumpHeap(String fileName, boolean live) {