Replace FluentIterable with streams

prestodb · Jan 5, 2015 · 56f95f9 · 56f95f9
1 parent faff36c
commit 56f95f9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorMetadata.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorMetadata.java
@@ -35,9 +35,7 @@
 import com.facebook.presto.spi.ViewNotFoundException;
 import com.facebook.presto.spi.type.StandardTypes;
 import com.facebook.presto.spi.type.Type;
-import com.google.common.base.Predicate;
 import com.google.common.base.Splitter;
-import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMap;
@@ -57,6 +55,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.function.Predicate;
 
 import static com.facebook.presto.raptor.RaptorColumnHandle.SAMPLE_WEIGHT_COLUMN_NAME;
 import static com.facebook.presto.raptor.RaptorErrorCode.RAPTOR_ERROR;
@@ -68,8 +67,8 @@
 import static com.facebook.presto.spi.type.BigintType.BIGINT;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Predicates.not;
 import static java.lang.String.format;
+import static java.util.stream.Collectors.toList;
 
 public class RaptorMetadata
         implements ConnectorMetadata
@@ -142,13 +141,12 @@ private ConnectorTableHandle getTableHandle(SchemaTableName tableName)
     @Override
     public ConnectorTableMetadata getTableMetadata(ConnectorTableHandle tableHandle)
     {
-        RaptorTableHandle raptorTableHandle = checkType(tableHandle, RaptorTableHandle.class, "tableHandle");
+        RaptorTableHandle handle = checkType(tableHandle, RaptorTableHandle.class, "tableHandle");
-        SchemaTableName tableName = new SchemaTableName(raptorTableHandle.getSchemaName(), raptorTableHandle.getTableName());
+        SchemaTableName tableName = new SchemaTableName(handle.getSchemaName(), handle.getTableName());
-        List<ColumnMetadata> columns = FluentIterable
+        List<ColumnMetadata> columns = dao.getTableColumns(handle.getTableId()).stream()
-                .from(dao.getTableColumns(raptorTableHandle.getTableId()))
+                .map(TableColumn::toColumnMetadata)
-                .transform(TableColumn::toColumnMetadata)
+                .filter(isSampleWeightColumn().negate())
-                .filter(not(isSampleWeightColumn()))
+                .collect(toList());
-                .toList();
         if (columns.isEmpty()) {
             throw new PrestoException(RAPTOR_ERROR, "Table does not have any columns: " + tableName);
         }

diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorPageSinkProvider.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorPageSinkProvider.java
@@ -19,7 +19,6 @@
 import com.facebook.presto.spi.ConnectorOutputTableHandle;
 import com.facebook.presto.spi.ConnectorPageSink;
 import com.facebook.presto.spi.ConnectorPageSinkProvider;
-import com.google.common.collect.FluentIterable;
 
 import javax.inject.Inject;
 
@@ -28,6 +27,7 @@
 
 import static com.facebook.presto.raptor.util.Types.checkType;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.stream.Collectors.toList;
 
 public class RaptorPageSinkProvider
         implements ConnectorPageSinkProvider
@@ -73,7 +73,7 @@ public ConnectorPageSink createPageSink(ConnectorInsertTableHandle tableHandle)
 
     private static List<Long> toColumnIds(List<RaptorColumnHandle> columnHandles)
     {
-        return FluentIterable.from(columnHandles).transform(RaptorColumnHandle::getColumnId).toList();
+        return columnHandles.stream().map(RaptorColumnHandle::getColumnId).collect(toList());
     }
 
     private static Optional<Long> optionalColumnId(RaptorColumnHandle handle)

diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorPageSourceProvider.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorPageSourceProvider.java
@@ -19,15 +19,15 @@
 import com.facebook.presto.spi.ConnectorPageSourceProvider;
 import com.facebook.presto.spi.ConnectorSplit;
 import com.facebook.presto.spi.type.Type;
-import com.google.common.base.Function;
-import com.google.common.collect.FluentIterable;
 import com.google.inject.Inject;
 
 import java.util.List;
 import java.util.UUID;
+import java.util.function.Function;
 
 import static com.facebook.presto.raptor.util.Types.checkType;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.stream.Collectors.toList;
 
 public class RaptorPageSourceProvider
         implements ConnectorPageSourceProvider
@@ -46,9 +46,9 @@ public ConnectorPageSource createPageSource(ConnectorSplit split, List<Connector
         RaptorSplit raptorSplit = checkType(split, RaptorSplit.class, "split");
 
         UUID shardUuid = raptorSplit.getShardUuid();
-        List<RaptorColumnHandle> columnHandles = FluentIterable.from(columns).transform(toRaptorColumnHandle()).toList();
+        List<RaptorColumnHandle> columnHandles = columns.stream().map(toRaptorColumnHandle()).collect(toList());
-        List<Long> columnIds = FluentIterable.from(columnHandles).transform(RaptorColumnHandle::getColumnId).toList();
+        List<Long> columnIds = columnHandles.stream().map(RaptorColumnHandle::getColumnId).collect(toList());
-        List<Type> columnTypes = FluentIterable.from(columnHandles).transform(RaptorColumnHandle::getColumnType).toList();
+        List<Type> columnTypes = columnHandles.stream().map(RaptorColumnHandle::getColumnType).collect(toList());
 
         return storageManager.getPageSource(shardUuid, columnIds, columnTypes, raptorSplit.getEffectivePredicate());
     }