Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix start index with page size for list rows #793

Merged
merged 1 commit into from Oct 13, 2020
Merged

fix: fix start index with page size for list rows #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
View file
Open in desktop
Expand Up @@ -1089,9 +1089,11 @@ public TableDataList call() {
EXCEPTION_HANDLER,
serviceOptions.getClock());
String cursor = result.getPageToken();
Map<BigQueryRpc.Option, ?> pageOptionMap =
Strings.isNullOrEmpty(cursor) ? optionsMap : optionMap(TableDataListOption.startIndex(0));
return Tuple.of(
new PageImpl<>(
new TableDataPageFetcher(tableId, schema, serviceOptions, cursor, optionsMap),
new TableDataPageFetcher(tableId, schema, serviceOptions, cursor, pageOptionMap),
cursor,
transformTableData(result.getRows(), schema)),
result.getTotalRows());
Expand Down
35 changes: 35 additions & 0 deletions google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
View file
Open in desktop
Expand Up @@ -26,6 +26,7 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
Expand Down Expand Up @@ -1470,6 +1471,40 @@ public void testListTableDataWithOptions() {
verify(bigqueryRpcMock).listTableData(PROJECT, DATASET, TABLE, TABLE_DATA_LIST_OPTIONS);
}

@Test
public void testListTableDataWithNextPage() {
doReturn(TABLE_DATA_PB)
.when(bigqueryRpcMock)
.listTableData(PROJECT, DATASET, TABLE, TABLE_DATA_LIST_OPTIONS);
bigquery = options.getService();
TableResult page =
bigquery.listTableData(
DATASET,
TABLE,
TABLE_DATA_LIST_PAGE_SIZE,
TABLE_DATA_LIST_PAGE_TOKEN,
TABLE_DATA_LIST_START_INDEX);
assertEquals(CURSOR, page.getNextPageToken());
verify(bigqueryRpcMock).listTableData(PROJECT, DATASET, TABLE, TABLE_DATA_LIST_OPTIONS);
assertArrayEquals(TABLE_DATA.toArray(), Iterables.toArray(page.getValues(), List.class));
Map<BigQueryRpc.Option, ?> SECOND_TABLE_DATA_LIST_OPTIONS =
ImmutableMap.of(BigQueryRpc.Option.PAGE_TOKEN, CURSOR, BigQueryRpc.Option.START_INDEX, 0L);
doReturn(
new TableDataList()
.setPageToken(null)
.setTotalRows(1L)
.setRows(
ImmutableList.of(
new TableRow().setF(ImmutableList.of(new TableCell().setV("Value3"))),
new TableRow().setF(ImmutableList.of(new TableCell().setV("Value4"))))))
.when(bigqueryRpcMock)
.listTableData(PROJECT, DATASET, TABLE, SECOND_TABLE_DATA_LIST_OPTIONS);
assertTrue(page.hasNextPage());
page = page.getNextPage();
assertNull(page.getNextPageToken());
verify(bigqueryRpcMock).listTableData(PROJECT, DATASET, TABLE, SECOND_TABLE_DATA_LIST_OPTIONS);
}

// The "minimally initialized" Job that lets Job.fromPb run without throwing.
private static com.google.api.services.bigquery.model.Job newJobPb() {
return new com.google.api.services.bigquery.model.Job()
Expand Down
23 changes: 23 additions & 0 deletions google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
View file
Open in desktop
Expand Up @@ -112,6 +112,7 @@
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
Expand Down Expand Up @@ -365,6 +366,9 @@ public class ITBigQueryTest {
private static final Set<String> PUBLIC_DATASETS =
ImmutableSet.of("github_repos", "hacker_news", "noaa_gsod", "samples", "usa_names");

private static final String PUBLIC_PROJECT = "bigquery-public-data";
private static final String PUBLIC_DATASET = "census_bureau_international";

private static BigQuery bigquery;
private static Storage storage;

Expand Down Expand Up @@ -1342,6 +1346,25 @@ public void testListAllTableData() {
assertEquals(2, rowCount);
}

@Test
public void testListPageWithStartIndex() {
String tableName = "midyear_population_agespecific";
TableId tableId = TableId.of(PUBLIC_PROJECT, PUBLIC_DATASET, tableName);
Table table = bigquery.getTable(tableId);
long numRows = table.getNumRows().longValue();
Page<FieldValueList> tableResult =
bigquery.listTableData(
tableId,
BigQuery.TableDataListOption.startIndex(numRows - 300_000L),
BigQuery.TableDataListOption.pageSize(600_000L));
assertNotNull(tableResult.getNextPageToken());
long totalRows = ((Collection<?>) tableResult.getValues()).size();
tableResult = tableResult.getNextPage();
totalRows = totalRows + ((Collection<?>) tableResult.getValues()).size();
assertNull(tableResult.getNextPageToken());
assertEquals(300_000L, totalRows);
}

@Test
public void testModelLifecycle() throws InterruptedException {

Expand Down