Rename Session to ConnectorSession

presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraMetadata.java

@@ -16,14 +16,14 @@
 import com.facebook.presto.cassandra.util.CassandraCqlUtils;
 import com.facebook.presto.spi.ConnectorColumnHandle;
 import com.facebook.presto.spi.ColumnMetadata;
+import com.facebook.presto.spi.ConnectorSession;
 import com.facebook.presto.spi.ConnectorTableHandle;
 import com.facebook.presto.spi.ConnectorTableMetadata;
 import com.facebook.presto.spi.NotFoundException;
 import com.facebook.presto.spi.ReadOnlyConnectorMetadata;
 import com.facebook.presto.spi.SchemaNotFoundException;
 import com.facebook.presto.spi.SchemaTableName;
 import com.facebook.presto.spi.SchemaTablePrefix;
-import com.facebook.presto.spi.Session;
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -51,13 +51,13 @@ public CassandraMetadata(CassandraConnectorId connectorId, CachingCassandraSchem
  }
 
  @Override
- public List<String> listSchemaNames(Session session)
+ public List<String> listSchemaNames(ConnectorSession session)
  {
  return schemaProvider.getAllSchemas();
  }
 
  @Override
- public CassandraTableHandle getTableHandle(Session session, SchemaTableName tableName)
+ public CassandraTableHandle getTableHandle(ConnectorSession session, SchemaTableName tableName)
  {
  checkNotNull(tableName, "tableName is null");
  try {
@@ -94,7 +94,7 @@ private ConnectorTableMetadata getTableMetadata(SchemaTableName tableName)
  }
 
  @Override
- public List<SchemaTableName> listTables(Session session, String schemaNameOrNull)
+ public List<SchemaTableName> listTables(ConnectorSession session, String schemaNameOrNull)
  {
  ImmutableList.Builder<SchemaTableName> tableNames = ImmutableList.builder();
  for (String schemaName : listSchemas(session, schemaNameOrNull)) {
@@ -110,7 +110,7 @@ public List<SchemaTableName> listTables(Session session, String schemaNameOrNull
  return tableNames.build();
  }
 
- private List<String> listSchemas(Session session, String schemaNameOrNull)
+ private List<String> listSchemas(ConnectorSession session, String schemaNameOrNull)
  {
  if (schemaNameOrNull == null) {
  return listSchemaNames(session);
@@ -144,7 +144,7 @@ public Map<String, ConnectorColumnHandle> getColumnHandles(ConnectorTableHandle
  }
 
  @Override
- public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(Session session, SchemaTablePrefix prefix)
+ public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSession session, SchemaTablePrefix prefix)
  {
  checkNotNull(prefix, "prefix is null");
  ImmutableMap.Builder<SchemaTableName, List<ColumnMetadata>> columns = ImmutableMap.builder();
@@ -159,7 +159,7 @@ public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(Session sessi
  return columns.build();
  }
 
- private List<SchemaTableName> listTables(Session session, SchemaTablePrefix prefix)
+ private List<SchemaTableName> listTables(ConnectorSession session, SchemaTablePrefix prefix)
  {
  if (prefix.getSchemaName() == null) {
  return listTables(session, prefix.getSchemaName());

presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraConnector.java

@@ -20,6 +20,7 @@
 import com.facebook.presto.spi.ConnectorMetadata;
 import com.facebook.presto.spi.ConnectorPartitionResult;
 import com.facebook.presto.spi.ConnectorRecordSetProvider;
+import com.facebook.presto.spi.ConnectorSession;
 import com.facebook.presto.spi.ConnectorSplit;
 import com.facebook.presto.spi.ConnectorSplitManager;
 import com.facebook.presto.spi.ConnectorSplitSource;
@@ -29,7 +30,6 @@
 import com.facebook.presto.spi.SchemaNotFoundException;
 import com.facebook.presto.spi.SchemaTableName;
 import com.facebook.presto.spi.SchemaTablePrefix;
-import com.facebook.presto.spi.Session;
 import com.facebook.presto.spi.TupleDomain;
 import com.facebook.presto.spi.type.Type;
 import com.google.common.base.Charsets;
@@ -79,7 +79,7 @@
 
 public class TestCassandraConnector
 {
- private static final Session SESSION = new Session("user", "test", "catalog", "test", UTC_KEY, Locale.ENGLISH, null, null);
+ private static final ConnectorSession SESSION = new ConnectorSession("user", "test", "catalog", "test", UTC_KEY, Locale.ENGLISH, null, null);
  protected static final String INVALID_DATABASE = "totally_invalid_database";
 
  private ConnectorMetadata metadata;

presto-example-http/src/main/java/com/facebook/presto/example/ExampleMetadata.java

@@ -15,12 +15,12 @@
 
 import com.facebook.presto.spi.ConnectorColumnHandle;
 import com.facebook.presto.spi.ColumnMetadata;
+import com.facebook.presto.spi.ConnectorSession;
 import com.facebook.presto.spi.ConnectorTableHandle;
 import com.facebook.presto.spi.ConnectorTableMetadata;
 import com.facebook.presto.spi.ReadOnlyConnectorMetadata;
 import com.facebook.presto.spi.SchemaTableName;
 import com.facebook.presto.spi.SchemaTablePrefix;
-import com.facebook.presto.spi.Session;
 import com.facebook.presto.spi.TableNotFoundException;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -50,7 +50,7 @@ public ExampleMetadata(ExampleConnectorId connectorId, ExampleClient exampleClie
  }
 
  @Override
- public List<String> listSchemaNames(Session session)
+ public List<String> listSchemaNames(ConnectorSession session)
  {
  return listSchemaNames();
  }
@@ -61,7 +61,7 @@ public List<String> listSchemaNames()
  }
 
  @Override
- public ExampleTableHandle getTableHandle(Session session, SchemaTableName tableName)
+ public ExampleTableHandle getTableHandle(ConnectorSession session, SchemaTableName tableName)
  {
  if (!listSchemaNames(session).contains(tableName.getSchemaName())) {
  return null;
@@ -87,7 +87,7 @@ public ConnectorTableMetadata getTableMetadata(ConnectorTableHandle table)
  }
 
  @Override
- public List<SchemaTableName> listTables(Session session, String schemaNameOrNull)
+ public List<SchemaTableName> listTables(ConnectorSession session, String schemaNameOrNull)
  {
  Set<String> schemaNames;
  if (schemaNameOrNull != null) {
@@ -139,7 +139,7 @@ public Map<String, ConnectorColumnHandle> getColumnHandles(ConnectorTableHandle
  }
 
  @Override
- public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(Session session, SchemaTablePrefix prefix)
+ public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSession session, SchemaTablePrefix prefix)
  {
  checkNotNull(prefix, "prefix is null");
  ImmutableMap.Builder<SchemaTableName, List<ColumnMetadata>> columns = ImmutableMap.builder();
@@ -167,7 +167,7 @@ private ConnectorTableMetadata getTableMetadata(SchemaTableName tableName)
  return new ConnectorTableMetadata(tableName, table.getColumnsMetadata());
  }
 
- private List<SchemaTableName> listTables(Session session, SchemaTablePrefix prefix)
+ private List<SchemaTableName> listTables(ConnectorSession session, SchemaTablePrefix prefix)
  {
  if (prefix.getSchemaName() == null) {
  return listTables(session, prefix.getSchemaName());

presto-example-http/src/test/java/com/facebook/presto/example/TestExampleMetadata.java

@@ -14,9 +14,9 @@
 package com.facebook.presto.example;
 
 import com.facebook.presto.spi.ColumnMetadata;
+import com.facebook.presto.spi.ConnectorSession;
 import com.facebook.presto.spi.ConnectorTableMetadata;
 import com.facebook.presto.spi.SchemaTableName;
-import com.facebook.presto.spi.Session;
 import com.facebook.presto.spi.TableNotFoundException;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -41,7 +41,7 @@
 @Test(singleThreaded = true)
 public class TestExampleMetadata
 {
- private static final Session SESSION = new Session("user", "test", "default", "default", UTC_KEY, Locale.ENGLISH, null, null);
+ private static final ConnectorSession SESSION = new ConnectorSession("user", "test", "default", "default", UTC_KEY, Locale.ENGLISH, null, null);
  private static final String CONNECTOR_ID = "TEST";
  private static final ExampleTableHandle NUMBERS_TABLE_HANDLE = new ExampleTableHandle(CONNECTOR_ID, "example", "numbers");
  private ExampleMetadata metadata;

presto-hive/src/main/java/com/facebook/presto/hive/HiveClient.java

@@ -27,6 +27,7 @@
 import com.facebook.presto.spi.ConnectorPartitionResult;
 import com.facebook.presto.spi.ConnectorRecordSetProvider;
 import com.facebook.presto.spi.ConnectorRecordSinkProvider;
+import com.facebook.presto.spi.ConnectorSession;
 import com.facebook.presto.spi.ConnectorSplit;
 import com.facebook.presto.spi.ConnectorSplitManager;
 import com.facebook.presto.spi.ConnectorSplitSource;
@@ -40,7 +41,6 @@
 import com.facebook.presto.spi.SchemaNotFoundException;
 import com.facebook.presto.spi.SchemaTableName;
 import com.facebook.presto.spi.SchemaTablePrefix;
-import com.facebook.presto.spi.Session;
 import com.facebook.presto.spi.TableNotFoundException;
 import com.facebook.presto.spi.TupleDomain;
 import com.facebook.presto.spi.type.Type;
@@ -217,13 +217,13 @@ public String getConnectorId()
  }
 
  @Override
- public List<String> listSchemaNames(Session session)
+ public List<String> listSchemaNames(ConnectorSession session)
  {
  return metastore.getAllDatabases();
  }
 
  @Override
- public HiveTableHandle getTableHandle(Session session, SchemaTableName tableName)
+ public HiveTableHandle getTableHandle(ConnectorSession session, SchemaTableName tableName)
  {
  checkNotNull(tableName, "tableName is null");
  try {
@@ -263,7 +263,7 @@ private ConnectorTableMetadata getTableMetadata(SchemaTableName tableName)
  }
 
  @Override
- public List<SchemaTableName> listTables(Session session, String schemaNameOrNull)
+ public List<SchemaTableName> listTables(ConnectorSession session, String schemaNameOrNull)
  {
  ImmutableList.Builder<SchemaTableName> tableNames = ImmutableList.builder();
  for (String schemaName : listSchemas(session, schemaNameOrNull)) {
@@ -279,7 +279,7 @@ public List<SchemaTableName> listTables(Session session, String schemaNameOrNull
  return tableNames.build();
  }
 
- private List<String> listSchemas(Session session, String schemaNameOrNull)
+ private List<String> listSchemas(ConnectorSession session, String schemaNameOrNull)
  {
  if (schemaNameOrNull == null) {
  return listSchemaNames(session);
@@ -314,7 +314,7 @@ public ConnectorColumnHandle getSampleWeightColumnHandle(ConnectorTableHandle ta
  }
 
  @Override
- public boolean canCreateSampledTables(Session session)
+ public boolean canCreateSampledTables(ConnectorSession session)
  {
  return true;
  }
@@ -364,7 +364,7 @@ private List<HiveColumnHandle> getColumnHandles(Table table, boolean includeSamp
  }
 
  @Override
- public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(Session session, SchemaTablePrefix prefix)
+ public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSession session, SchemaTablePrefix prefix)
  {
  checkNotNull(prefix, "prefix is null");
  ImmutableMap.Builder<SchemaTableName, List<ColumnMetadata>> columns = ImmutableMap.builder();
@@ -379,7 +379,7 @@ public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(Session sessi
  return columns.build();
  }
 
- private List<SchemaTableName> listTables(Session session, SchemaTablePrefix prefix)
+ private List<SchemaTableName> listTables(ConnectorSession session, SchemaTablePrefix prefix)
  {
  if (prefix.getSchemaName() == null) {
  return listTables(session, prefix.getSchemaName());
@@ -398,7 +398,7 @@ public ColumnMetadata getColumnMetadata(ConnectorTableHandle tableHandle, Connec
  }
 
  @Override
- public ConnectorTableHandle createTable(Session session, ConnectorTableMetadata tableMetadata)
+ public ConnectorTableHandle createTable(ConnectorSession session, ConnectorTableMetadata tableMetadata)
  {
  throw new UnsupportedOperationException();
  }
@@ -410,7 +410,7 @@ public void dropTable(ConnectorTableHandle tableHandle)
  }
 
  @Override
- public HiveOutputTableHandle beginCreateTable(Session session, ConnectorTableMetadata tableMetadata)
+ public HiveOutputTableHandle beginCreateTable(ConnectorSession session, ConnectorTableMetadata tableMetadata)
  {
  checkArgument(!isNullOrEmpty(tableMetadata.getOwner()), "Table owner is null or empty");
 

presto-hive/src/main/java/com/facebook/presto/hive/HiveSplit.java

@@ -13,9 +13,9 @@
  */
 package com.facebook.presto.hive;
 
+import com.facebook.presto.spi.ConnectorSession;
 import com.facebook.presto.spi.ConnectorSplit;
 import com.facebook.presto.spi.HostAddress;
-import com.facebook.presto.spi.Session;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Objects;
@@ -41,7 +41,7 @@ public class HiveSplit
  private final String database;
  private final String table;
  private final String partitionName;
- private final Session session;
+ private final ConnectorSession session;
 
  @JsonCreator
  public HiveSplit(
@@ -55,7 +55,7 @@ public HiveSplit(
  @JsonProperty("schema") Properties schema,
  @JsonProperty("partitionKeys") List<HivePartitionKey> partitionKeys,
  @JsonProperty("addresses") List<HostAddress> addresses,
- @JsonProperty("session") Session session)
+ @JsonProperty("session") ConnectorSession session)
  {
  this.session = session;
  checkNotNull(clientId, "clientId is null");
@@ -143,7 +143,7 @@ public List<HostAddress> getAddresses()
  }
 
  @JsonProperty
- public Session getSession()
+ public ConnectorSession getSession()
  {
  return session;
  }

presto-hive/src/main/java/com/facebook/presto/hive/HiveSplitSourceProvider.java

@@ -17,11 +17,11 @@
 import com.facebook.presto.hive.util.BoundedExecutor;
 import com.facebook.presto.hive.util.FileStatusCallback;
 import com.facebook.presto.hive.util.SuspendingExecutor;
+import com.facebook.presto.spi.ConnectorSession;
 import com.facebook.presto.spi.ConnectorSplit;
 import com.facebook.presto.spi.ConnectorSplitSource;
 import com.facebook.presto.spi.HostAddress;
 import com.facebook.presto.spi.PrestoException;
-import com.facebook.presto.spi.Session;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
@@ -111,7 +111,7 @@ public Object getInfo()
  private final ClassLoader classLoader;
  private final DataSize maxSplitSize;
  private final int maxPartitionBatchSize;
- private final Session session;
+ private final ConnectorSession session;
 
  HiveSplitSourceProvider(String connectorId,
  Table table,
@@ -126,7 +126,7 @@ public Object getInfo()
  DirectoryLister directoryLister,
  Executor executor,
  int maxPartitionBatchSize,
- Session session)
+ ConnectorSession session)
  {
  this.connectorId = connectorId;
  this.table = table;
@@ -166,7 +166,7 @@ public void run()
  return hiveSplitSource;
  }
 
- private void loadPartitionSplits(final HiveSplitSource hiveSplitSource, SuspendingExecutor suspendingExecutor, final Session session)
+ private void loadPartitionSplits(final HiveSplitSource hiveSplitSource, SuspendingExecutor suspendingExecutor, final ConnectorSession session)
  throws InterruptedException
  {
  final Semaphore semaphore = new Semaphore(maxPartitionBatchSize);
@@ -335,7 +335,7 @@ private List<HiveSplit> createHiveSplits(
  Properties schema,
  List<HivePartitionKey> partitionKeys,
  boolean splittable,
- Session session)
+ ConnectorSession session)
  throws IOException
  {
  ImmutableList.Builder<HiveSplit> builder = ImmutableList.builder();

presto-hive/src/main/java/com/facebook/presto/hive/HiveTableHandle.java

@@ -13,9 +13,9 @@
  */
 package com.facebook.presto.hive;
 
+import com.facebook.presto.spi.ConnectorSession;
 import com.facebook.presto.spi.ConnectorTableHandle;
 import com.facebook.presto.spi.SchemaTableName;
-import com.facebook.presto.spi.Session;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Objects;
@@ -28,14 +28,14 @@ public class HiveTableHandle
  private final String clientId;
  private final String schemaName;
  private final String tableName;
- private final Session session;
+ private final ConnectorSession session;
 
  @JsonCreator
  public HiveTableHandle(
  @JsonProperty("clientId") String clientId,
  @JsonProperty("schemaName") String schemaName,
  @JsonProperty("tableName") String tableName,
- @JsonProperty("session") Session session)
+ @JsonProperty("session") ConnectorSession session)
  {
  this.clientId = checkNotNull(clientId, "clientId is null");
  this.schemaName = checkNotNull(schemaName, "schemaName is null");
@@ -56,7 +56,7 @@ public String getSchemaName()
  }
 
  @JsonProperty
- public Session getSession()
+ public ConnectorSession getSession()
  {
  return session;
  }