Skip to content

Commit

Permalink
CAY-2814 Select query iterator() and batchIterator() methods return i…
Browse files Browse the repository at this point in the history 
…ncorrect results

 - fix tests
  • Loading branch information
@stariy95
stariy95 committed Nov 6, 2023
1 parent 5a3ac74 commit 548e94c
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 31 deletions.
29 changes: 20 additions & 9 deletions cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelectIteratedQueryIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public void prefetchWithBatchIterator() {
try (ResultBatchIterator<Painting> iterator = ObjectSelect
.query(Painting.class)
.prefetch(Painting.TO_ARTIST.joint())
.orderBy(Painting.PAINTING_ID_PK_PROPERTY.asc())
.batchIterator(context, 10)) {
int count = 0;
while (iterator.hasNext()) {
Expand All @@ -97,7 +98,7 @@ public void prefetchWithBatchIterator() {
assertEquals("Test1", painting.getToArtist().readPropertyDirectly("artistName"));
}
}
assertEquals(2,count);
assertEquals(2, count);
}
}

Expand All @@ -106,16 +107,17 @@ public void queryPrefetchJointWithIterator() {
try (ResultIterator<Painting> iterator = ObjectSelect
.query(Painting.class)
.prefetch(Painting.TO_ARTIST.joint())
.orderBy(Painting.PAINTING_ID_PK_PROPERTY.asc())
.iterator(context)) {
int count = 0;
while (iterator.hasNextRow()) {
count++;
Painting painting = iterator.nextRow();
//noinspection ConstantConditions
assertTrue(painting instanceof Painting);
assertEquals("Test1", painting.getToArtist().readPropertyDirectly("artistName"));
//noinspection ConstantConditions
assertTrue(painting instanceof Painting);
assertEquals("Test1", painting.getToArtist().readPropertyDirectly("artistName"));
}
assertEquals(20,count);
assertEquals(20, count);
}
}

Expand Down Expand Up @@ -156,6 +158,7 @@ public void queryPrefetchDisjointByIdWithBIterator() {
try (ResultIterator<Painting> iterator = ObjectSelect
.query(Painting.class)
.prefetch(Painting.TO_ARTIST.disjointById())
.orderBy(Painting.PAINTING_ID_PK_PROPERTY.asc())
.iterator(context)) {
int count = 0;
while (iterator.hasNextRow()) {
Expand All @@ -165,15 +168,16 @@ public void queryPrefetchDisjointByIdWithBIterator() {
assertTrue(painting instanceof Painting);
assertEquals("Test1", painting.getToArtist().readPropertyDirectly("artistName"));
}
assertEquals(20,count);
assertEquals(20, count);
}
}

@Test
public void queryPrefetchJointWithBatchIterator() {
try (ResultBatchIterator<Painting> iterator = ObjectSelect
.query(Painting.class,"Painting")
.query(Painting.class, "Painting")
.prefetch(Painting.TO_ARTIST.joint())
.orderBy(Painting.PAINTING_ID_PK_PROPERTY.asc())
.batchIterator(context, 5)) {
int count = 0;
int paintingCounter = 0;
Expand All @@ -195,6 +199,7 @@ public void QueryWithIterator() {
try (ResultIterator<Painting> iterator = ObjectSelect
.query(Painting.class, "Painting")
.prefetch(Painting.TO_ARTIST.joint())
.orderBy(Painting.PAINTING_ID_PK_PROPERTY.asc())
.iterator(context)) {
int count = 0;
int paintingCounter = 0;
Expand All @@ -213,6 +218,7 @@ public void QueryWithIterator() {
public void mappingWithBatchIterator() {
try (ResultBatchIterator<DTO> iterator = ObjectSelect
.columnQuery(Painting.class, Painting.PAINTING_TITLE, Painting.ESTIMATED_PRICE)
.orderBy(Painting.PAINTING_ID_PK_PROPERTY.asc())
.map(this::toDto)
.batchIterator(context, 5)) {
int count = 0;
Expand All @@ -226,14 +232,15 @@ public void mappingWithBatchIterator() {
}
}
assertEquals(5, iterator.getBatchSize());
assertEquals(4,count);
assertEquals(4, count);
}
}

@Test
public void mappingWithIterator() {
try (ResultIterator<DTO> iterator = ObjectSelect
.columnQuery(Painting.class, Painting.PAINTING_TITLE, Painting.ESTIMATED_PRICE)
.orderBy(Painting.PAINTING_ID_PK_PROPERTY.asc())
.map(this::toDto)
.iterator(context)) {
int count = 0;
Expand All @@ -252,6 +259,7 @@ public void mappingWithIterator() {
public void dataRowQueryWithBatchIterator() {
try (ResultBatchIterator<?> iterator = ObjectSelect
.dataRowQuery(Painting.class)
.orderBy(Painting.PAINTING_ID_PK_PROPERTY.asc())
.batchIterator(context, 5)) {
int count = 0;
int paintingCounter = 0;
Expand All @@ -272,6 +280,7 @@ public void dataRowQueryWithBatchIterator() {
public void dataRowQueryWithIterator() {
try (ResultIterator<?> iterator = ObjectSelect
.dataRowQuery(Painting.class)
.orderBy(Painting.PAINTING_ID_PK_PROPERTY.asc())
.iterator(context)) {
int count = 0;
int paintingCounter = 0;
Expand All @@ -290,6 +299,7 @@ public void dataRowQueryWithIterator() {
public void dbQueryWithIterator() {
try (ResultIterator<?> iterator = ObjectSelect
.dbQuery("PAINTING")
.orderBy("db:" + Painting.PAINTING_ID_PK_COLUMN)
.iterator(context)) {
int count = 0;
int paintingCounter = 0;
Expand All @@ -308,6 +318,7 @@ public void dbQueryWithIterator() {
public void dbQueryWithBatchIterator() {
try (ResultBatchIterator<?> iterator = ObjectSelect
.dbQuery("PAINTING")
.orderBy("db:" + Painting.PAINTING_ID_PK_COLUMN)
.batchIterator(context, 5)) {
int count = 0;
int paintingCounter = 0;
Expand Down Expand Up @@ -342,7 +353,7 @@ static class DTO {
private final Long estimatedPrice;

public DTO(Object[] data) {
this.title = "dto_" + (String) data[0];
this.title = "dto_" + data[0];
this.estimatedPrice = ((Number) data[1]).longValue();
}

Expand Down
38 changes: 16 additions & 22 deletions cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIteratedQueryIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
****************************************************************/
package org.apache.cayenne.query;

import org.apache.cayenne.Cayenne;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ResultBatchIterator;
import org.apache.cayenne.ResultIterator;
Expand All @@ -38,7 +39,6 @@
import java.util.List;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;


@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
Expand Down Expand Up @@ -84,15 +84,14 @@ private void createArtistDataSet() throws SQLException {
public void queryWithButchIterator() {
try (ResultBatchIterator<Painting> iterator = SelectById
.query(Painting.class, Arrays.asList(1,2,3,4,5,6))
.batchIterator(context, 3)){
.batchIterator(context, 4)){
int count = 0;
int paintingCounter = 0;
while (iterator.hasNext()) {
count++;
List<Painting> paintingList = iterator.next();
for (Painting painting : paintingList) {
paintingCounter++;
assertEquals("painting" + paintingCounter, painting.getPaintingTitle());
assertEquals("painting" + Cayenne.longPKForObject(painting),
painting.getPaintingTitle());
}
}
assertEquals(2, count);
Expand All @@ -105,31 +104,28 @@ public void queryWithIterator() {
.query(Painting.class, Arrays.asList(1,2,3,4,5,6))
.iterator(context)){
int count = 0;
int paintingCounter = 0;
while (iterator.hasNextRow()) {
count++;
Painting painting = iterator.nextRow();
paintingCounter++;
assertEquals("painting" + paintingCounter, painting.getPaintingTitle());
assertEquals("painting" + Cayenne.longPKForObject(painting),
painting.getPaintingTitle());
}
assertEquals(6, count);
}
}

@Test
public void dataRowQueryWithBatchIterator() {
try (ResultBatchIterator<?> iterator = SelectById
try (ResultBatchIterator<DataRow> iterator = SelectById
.dataRowQuery(Painting.class, 1, 2,3,4,5,6)
.batchIterator(context, 3)) {
.batchIterator(context, 4)) {
int count = 0;
int paintingCounter = 0;
while (iterator.hasNext()) {
count++;
List<?> rows = iterator.next();
for (Object row : rows) {
paintingCounter++;
Painting painting = context.objectFromDataRow(Painting.class, (DataRow) row);
assertEquals("painting" + paintingCounter, painting.getPaintingTitle());
List<DataRow> rows = iterator.next();
for (DataRow row : rows) {
assertEquals("painting" + row.get(Painting.PAINTING_ID_PK_COLUMN),
row.get("PAINTING_TITLE"));
}
}
assertEquals(2, count);
Expand All @@ -138,17 +134,15 @@ public void dataRowQueryWithBatchIterator() {

@Test
public void dataRowQueryWithIterator() {
try (ResultIterator<?> iterator = SelectById
try (ResultIterator<DataRow> iterator = SelectById
.dataRowQuery(Painting.class, 1, 2,3,4,5,6)
.iterator(context)) {
int count = 0;
int paintingCounter = 0;
while (iterator.hasNextRow()) {
count++;
paintingCounter++;
Object row = iterator.nextRow();
Painting painting = context.objectFromDataRow(Painting.class, (DataRow) row);
assertEquals("painting" + paintingCounter, painting.getPaintingTitle());
DataRow row = iterator.nextRow();
assertEquals("painting" + row.get(Painting.PAINTING_ID_PK_COLUMN),
row.get("PAINTING_TITLE"));
}
assertEquals(6, count);
}
Expand Down

0 comments on commit 548e94c

Please sign in to comment.