address review comments

Author: wraymo

presto-clp/src/main/java/com/facebook/presto/plugin/clp/ClpExpression.java

@@ -120,14 +120,14 @@ public ConnectorTableHandle getTableHandle(ConnectorSession session, SchemaTable
     }
 
     @Override
-    public List<ConnectorTableLayoutResult> getTableLayouts(ConnectorSession session,
-                                                            ConnectorTableHandle table,
-                                                            Constraint<ColumnHandle> constraint,
-                                                            Optional<Set<ColumnHandle>> desiredColumns)
+    public ConnectorTableLayoutResult getTableLayoutForConstraint(ConnectorSession session,
+                                                                  ConnectorTableHandle table,
+                                                                  Constraint<ColumnHandle> constraint,
+                                                                  Optional<Set<ColumnHandle>> desiredColumns)
     {
         ClpTableHandle tableHandle = (ClpTableHandle) table;
         ConnectorTableLayout layout = new ConnectorTableLayout(new ClpTableLayoutHandle(tableHandle, Optional.empty()));
-        return ImmutableList.of(new ConnectorTableLayoutResult(layout, constraint.getSummary()));
+        return new ConnectorTableLayoutResult(layout, constraint.getSummary());
     }
 
     @Override

presto-clp/src/main/java/com/facebook/presto/plugin/clp/ClpMetadata.java

@@ -13,6 +13,7 @@
  */
 package com.facebook.presto.plugin.clp;
 
+import com.facebook.airlift.log.Logger;
 import com.facebook.presto.plugin.clp.metadata.ClpMetadataProvider;
 import com.facebook.presto.plugin.clp.metadata.ClpMySqlMetadataProvider;
 import com.facebook.presto.plugin.clp.metadata.ClpNodeType;
@@ -32,6 +33,8 @@
 
 public final class ClpMetadataDbSetUp
 {
+    private static final Logger log = Logger.get(ClpMetadataDbSetUp.class);
+
     public static final String metadataDbUrlTemplate =
             "jdbc:h2:file:/tmp/%s;MODE=MySQL;DATABASE_TO_UPPER=FALSE";
     public static final String metadataDbTablePrefix = "clp_";
@@ -138,7 +141,7 @@ public void tearDown(String dbName)
         File lockFile = new File(String.format("/tmp/%s.trace.db", dbName)); // Optional, H2 sometimes creates this
         if (dbFile.exists()) {
             dbFile.delete();
-            System.out.println("Deleted database file: " + dbFile.getAbsolutePath());
+            log.info("Deleted database file: " + dbFile.getAbsolutePath());
         }
         if (lockFile.exists()) {
             lockFile.delete();

presto-clp/src/test/java/com/facebook/presto/plugin/clp/ClpMetadataDbSetUp.java

@@ -20,7 +20,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -64,15 +63,7 @@ public void setUp()
     @AfterMethod
     public void tearDown()
     {
-        File dbFile = new File("/tmp/split_testdb.mv.db");
-        File lockFile = new File("/tmp/split_testdb.trace.db"); // Optional, H2 sometimes creates this
-        if (dbFile.exists()) {
-            dbFile.delete();
-            System.out.println("Deleted database file: " + dbFile.getAbsolutePath());
-        }
-        if (lockFile.exists()) {
-            lockFile.delete();
-        }
+        clpMetadataDbSetUp.tearDown(databaseName);
     }
 
     @Test