From 1b93363a5e2f4bafb31b5f88e7b99f994d6ac41c Mon Sep 17 00:00:00 2001 From: David Phillips Date: Sat, 10 Oct 2015 11:11:49 -0700 Subject: [PATCH] Add test helper for creating a StoragePageSink --- .../raptor/storage/TestOrcStorageManager.java | 17 +++++++++++------ .../raptor/storage/TestShardCompactor.java | 9 +++++++-- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestOrcStorageManager.java b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestOrcStorageManager.java index 5a1749a7cf74..e69925001040 100644 --- a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestOrcStorageManager.java +++ b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestOrcStorageManager.java @@ -177,7 +177,7 @@ public void testWriter() List columnIds = ImmutableList.of(3L, 7L); List columnTypes = ImmutableList.of(BIGINT, VARCHAR); - StoragePageSink sink = manager.createStoragePageSink(columnIds, columnTypes); + StoragePageSink sink = createStoragePageSink(manager, columnIds, columnTypes); List pages = rowPagesBuilder(columnTypes) .row(123, "hello") .row(456, "bye") @@ -239,7 +239,7 @@ public void testReader() byte[] bytes1 = octets(0x00, 0xFE, 0xFF); byte[] bytes3 = octets(0x01, 0x02, 0x19, 0x80); - StoragePageSink sink = manager.createStoragePageSink(columnIds, columnTypes); + StoragePageSink sink = createStoragePageSink(manager, columnIds, columnTypes); Object[][] doubles = { {881, "-inf", null, null, null, Double.NEGATIVE_INFINITY}, @@ -311,7 +311,7 @@ public void testRewriter() List columnTypes = ImmutableList.of(BIGINT, VARCHAR); // create file with 2 rows - StoragePageSink sink = manager.createStoragePageSink(columnIds, columnTypes); + StoragePageSink sink = createStoragePageSink(manager, columnIds, columnTypes); List pages = rowPagesBuilder(columnTypes) .row(123, "hello") .row(456, "bye") @@ -450,7 +450,7 @@ public void testMaxShardRows() List columnIds = ImmutableList.of(3L, 7L); List columnTypes = ImmutableList.of(BIGINT, VARCHAR); - StoragePageSink sink = manager.createStoragePageSink(columnIds, columnTypes); + StoragePageSink sink = createStoragePageSink(manager, columnIds, columnTypes); List pages = rowPagesBuilder(columnTypes) .row(123, "hello") .row(456, "bye") @@ -473,11 +473,16 @@ public void testMaxFileSize() // Set maxFileSize to 1 byte, so adding any page makes the StoragePageSink full OrcStorageManager manager = createOrcStorageManager(storageService, backupStore, recoveryManager, 20, new DataSize(1, BYTE)); - StoragePageSink sink = manager.createStoragePageSink(columnIds, columnTypes); + StoragePageSink sink = createStoragePageSink(manager, columnIds, columnTypes); sink.appendPages(pages); assertTrue(sink.isFull()); } + private static StoragePageSink createStoragePageSink(StorageManager manager, List columnIds, List columnTypes) + { + return manager.createStoragePageSink(columnIds, columnTypes); + } + private OrcStorageManager createOrcStorageManager() { return createOrcStorageManager(storageService, backupStore, recoveryManager); @@ -581,7 +586,7 @@ private List columnStats(List columnTypes, Object[]... rows) List columnIds = list.build(); OrcStorageManager manager = createOrcStorageManager(); - StoragePageSink sink = manager.createStoragePageSink(columnIds, columnTypes); + StoragePageSink sink = createStoragePageSink(manager, columnIds, columnTypes); sink.appendPages(rowPagesBuilder(columnTypes).rows(rows).build()); List shards = sink.commit(); diff --git a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestShardCompactor.java b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestShardCompactor.java index beb7352be32f..02e941cff816 100644 --- a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestShardCompactor.java +++ b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestShardCompactor.java @@ -213,7 +213,7 @@ private MaterializedResult getMaterializedRows(Set uuids, List colum private static List createShardsSorted(StorageManager storageManager, List columnIds, List columnTypes, List sortChannels, List sortOrders, int count, int length) { - StoragePageSink sink = storageManager.createStoragePageSink(columnIds, columnTypes); + StoragePageSink sink = createStoragePageSink(storageManager, columnIds, columnTypes); for (int numShards = 0; numShards < count; numShards++) { List pages = createPages(columnTypes, 1, length); long[] orderedAddresses = PAGE_SORTER.sort(columnTypes, pages, sortChannels, sortOrders, 10_000); @@ -232,7 +232,7 @@ private static List createShardsSorted(StorageManager storageManager, private static List createShards(StorageManager storageManager, List columnIds, List columnTypes, int count, int length) { List pages = createPages(columnTypes, count, length); - StoragePageSink sink = storageManager.createStoragePageSink(columnIds, columnTypes); + StoragePageSink sink = createStoragePageSink(storageManager, columnIds, columnTypes); for (Page page : pages) { sink.appendPages(ImmutableList.of(page)); sink.flush(); @@ -240,6 +240,11 @@ private static List createShards(StorageManager storageManager, List< return sink.commit(); } + private static StoragePageSink createStoragePageSink(StorageManager manager, List columnIds, List columnTypes) + { + return manager.createStoragePageSink(columnIds, columnTypes); + } + private static List createPages(List columnTypes, int count, int length) { ImmutableList.Builder pages = ImmutableList.builder();