Skip to content

Commit

Permalink
Remove DEFAULT_CATALOG and DEFAULT_SCHEMA
Browse files Browse the repository at this point in the history
  • Loading branch information
@electrum
electrum committed Apr 30, 2014
1 parent ea271b6 commit 62b970c
Show file tree
Hide file tree
Showing 19 changed files with 59 additions and 83 deletions.
3 changes: 1 addition & 2 deletions presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraConnector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
import java.util.Map;
import java.util.UUID;

import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
import static com.facebook.presto.spi.type.BigintType.BIGINT;
import static com.facebook.presto.spi.type.BooleanType.BOOLEAN;
import static com.facebook.presto.spi.type.DoubleType.DOUBLE;
Expand All @@ -80,7 +79,7 @@

public class TestCassandraConnector
{
private static final Session SESSION = new Session("user", "test", DEFAULT_CATALOG, "test", UTC_KEY, Locale.ENGLISH, null, null);
private static final Session SESSION = new Session("user", "test", "catalog", "test", UTC_KEY, Locale.ENGLISH, null, null);
protected static final String INVALID_DATABASE = "totally_invalid_database";

private ConnectorMetadata metadata;
Expand Down
3 changes: 1 addition & 2 deletions presto-hive/src/test/java/com/facebook/presto/hive/TestHiveSplit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@
import java.util.Locale;
import java.util.Properties;

import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
import static com.facebook.presto.spi.type.TimeZoneKey.UTC_KEY;
import static org.testng.Assert.assertEquals;

public class TestHiveSplit
{
private static final Session SESSION = new Session("user", "test", DEFAULT_CATALOG, "test", UTC_KEY, Locale.ENGLISH, null, null);
private static final Session SESSION = new Session("user", "test", "catalog", "test", UTC_KEY, Locale.ENGLISH, null, null);
private final JsonCodec<HiveSplit> codec = JsonCodec.jsonCodec(HiveSplit.class);

@Test
Expand Down
3 changes: 1 addition & 2 deletions presto-hive/src/test/java/com/facebook/presto/hive/TestHiveTableHandle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@

import java.util.Locale;

import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
import static com.facebook.presto.spi.type.TimeZoneKey.UTC_KEY;
import static org.testng.Assert.assertEquals;

public class TestHiveTableHandle
{
private static final Session SESSION = new Session("user", "test", DEFAULT_CATALOG, "test", UTC_KEY, Locale.ENGLISH, null, null);
private static final Session SESSION = new Session("user", "test", "catalog", "test", UTC_KEY, Locale.ENGLISH, null, null);
private final JsonCodec<HiveTableHandle> codec = JsonCodec.jsonCodec(HiveTableHandle.class);

@Test
Expand Down
3 changes: 1 addition & 2 deletions presto-hive/src/test/java/com/facebook/presto/hive/TestJsonHiveHandles.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import java.util.Locale;
import java.util.Map;

import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
import static com.facebook.presto.spi.type.TimeZoneKey.UTC_KEY;
import static io.airlift.testing.Assertions.assertEqualsIgnoreOrder;
import static org.testng.Assert.assertEquals;
Expand All @@ -33,7 +32,7 @@
@Test
public class TestJsonHiveHandles
{
private static final Session SESSION = new Session("user", "test", DEFAULT_CATALOG, "test", UTC_KEY, Locale.ENGLISH, null, null);
private static final Session SESSION = new Session("user", "test", "catalog", "test", UTC_KEY, Locale.ENGLISH, null, null);

private static final Map<String, Object> TABLE_HANDLE_AS_MAP = ImmutableMap.<String, Object>of(
"clientId", "hive",
Expand Down
71 changes: 36 additions & 35 deletions presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestDriver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import java.util.List;
import java.util.Set;

import static com.facebook.presto.server.testing.TestingPrestoServer.TEST_CATALOG;
import static java.lang.String.format;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
Expand Down Expand Up @@ -203,7 +204,7 @@ public void testGetSchemas()
assertGetSchemasResult(rs, 2);
}

try (ResultSet rs = connection.getMetaData().getSchemas("default", null)) {
try (ResultSet rs = connection.getMetaData().getSchemas(TEST_CATALOG, null)) {
assertGetSchemasResult(rs, 2);
}

Expand All @@ -212,7 +213,7 @@ public void testGetSchemas()
assertGetSchemasResult(rs, 0);
}

try (ResultSet rs = connection.getMetaData().getSchemas("default", "sys")) {
try (ResultSet rs = connection.getMetaData().getSchemas(TEST_CATALOG, "sys")) {
assertGetSchemasResult(rs, 1);
}

Expand Down Expand Up @@ -240,7 +241,7 @@ public void testGetSchemas()
assertGetSchemasResult(rs, 0);
}

try (ResultSet rs = connection.getMetaData().getSchemas("default", "unknown")) {
try (ResultSet rs = connection.getMetaData().getSchemas(TEST_CATALOG, "unknown")) {
assertGetSchemasResult(rs, 0);
}

Expand All @@ -250,7 +251,7 @@ public void testGetSchemas()
}
}

private void assertGetSchemasResult(ResultSet rs, int expectedRows)
private static void assertGetSchemasResult(ResultSet rs, int expectedRows)
throws SQLException
{
assertRowCount(rs, expectedRows);
Expand Down Expand Up @@ -281,7 +282,7 @@ public void testGetTables()
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getTables("default", null, null, null)) {
try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, null, null, null)) {
assertTableMetadata(rs);

Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
Expand All @@ -302,7 +303,7 @@ public void testGetTables()
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", null, null)) {
try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", null, null)) {
assertTableMetadata(rs);

Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
Expand All @@ -313,7 +314,7 @@ public void testGetTables()
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getTables("default", "", null, null)) {
try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "", null, null)) {
assertTableMetadata(rs);

Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
Expand All @@ -322,7 +323,7 @@ public void testGetTables()
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", "tables", null)) {
try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", "tables", null)) {
assertTableMetadata(rs);

Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
Expand All @@ -333,7 +334,7 @@ public void testGetTables()
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", "tables", new String[] {"BASE TABLE"})) {
try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", "tables", new String[] {"BASE TABLE"})) {
assertTableMetadata(rs);

Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
Expand Down Expand Up @@ -377,7 +378,7 @@ public void testGetTables()
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getTables("default", "inf%", "tables", null)) {
try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "inf%", "tables", null)) {
assertTableMetadata(rs);

Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
Expand All @@ -388,7 +389,7 @@ public void testGetTables()
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", "tab%", null)) {
try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", "tab%", null)) {
assertTableMetadata(rs);

Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
Expand All @@ -411,7 +412,7 @@ public void testGetTables()

// todo why does Presto require that the schema name be lower case
try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getTables("default", "unknown", "tables", new String[] {"BASE TABLE"})) {
try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "unknown", "tables", new String[] {"BASE TABLE"})) {
assertTableMetadata(rs);

Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
Expand All @@ -422,7 +423,7 @@ public void testGetTables()
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", "unknown", new String[] {"BASE TABLE"})) {
try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", "unknown", new String[] {"BASE TABLE"})) {
assertTableMetadata(rs);

Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
Expand All @@ -433,7 +434,7 @@ public void testGetTables()
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", "tables", new String[] {"unknown"})) {
try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", "tables", new String[] {"unknown"})) {
assertTableMetadata(rs);

Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
Expand All @@ -444,7 +445,7 @@ public void testGetTables()
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", "tables", new String[] {"unknown", "BASE TABLE"})) {
try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", "tables", new String[] {"unknown", "BASE TABLE"})) {
assertTableMetadata(rs);

Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
Expand All @@ -455,7 +456,7 @@ public void testGetTables()
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getTables("default", "information_schema", "tables", new String[] {})) {
try (ResultSet rs = connection.getMetaData().getTables(TEST_CATALOG, "information_schema", "tables", new String[] {})) {
assertTableMetadata(rs);

Set<List<Object>> rows = ImmutableSet.copyOf(readRows(rs));
Expand All @@ -468,10 +469,10 @@ public void testGetTables()

private static List<Object> getTablesRow(String schema, String table)
{
return ImmutableList.<Object>of("default", schema, table, "BASE TABLE", "", "", "", "", "", "");
return ImmutableList.<Object>of(TEST_CATALOG, schema, table, "BASE TABLE", "", "", "", "", "", "");
}

private void assertTableMetadata(ResultSet rs)
private static void assertTableMetadata(ResultSet rs)
throws SQLException
{
ResultSetMetaData metadata = rs.getMetaData();
Expand Down Expand Up @@ -538,7 +539,7 @@ public void testGetColumns()
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getColumns("default", null, "tables", "column_name")) {
try (ResultSet rs = connection.getMetaData().getColumns(TEST_CATALOG, null, "tables", "column_name")) {
assertColumnMetadata(rs);
}
}
Expand All @@ -550,31 +551,31 @@ public void testGetColumns()
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getColumns("default", "information_schema", "tables", "column_name")) {
try (ResultSet rs = connection.getMetaData().getColumns(TEST_CATALOG, "information_schema", "tables", "column_name")) {
assertColumnMetadata(rs);
}
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getColumns("default", "inf%", "tables", "column_name")) {
try (ResultSet rs = connection.getMetaData().getColumns(TEST_CATALOG, "inf%", "tables", "column_name")) {
assertColumnMetadata(rs);
}
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getColumns("default", "information_schema", "tab%", "column_name")) {
try (ResultSet rs = connection.getMetaData().getColumns(TEST_CATALOG, "information_schema", "tab%", "column_name")) {
assertColumnMetadata(rs);
}
}

try (Connection connection = createConnection()) {
try (ResultSet rs = connection.getMetaData().getColumns("default", "information_schema", "tables", "col%")) {
try (ResultSet rs = connection.getMetaData().getColumns(TEST_CATALOG, "information_schema", "tables", "col%")) {
assertColumnMetadata(rs);
}
}
}

private void assertColumnMetadata(ResultSet rs)
private static void assertColumnMetadata(ResultSet rs)
throws SQLException
{
ResultSetMetaData metadata = rs.getMetaData();
Expand Down Expand Up @@ -751,26 +752,26 @@ public void testConnectionStringWithCatalogAndSchema()

connection = DriverManager.getConnection(prefix + "/a/", "test", null);
assertEquals(connection.getCatalog(), "a");
assertEquals(connection.getSchema(), "default");
assertEquals(connection.getSchema(), TEST_CATALOG);

connection = DriverManager.getConnection(prefix + "/a", "test", null);
assertEquals(connection.getCatalog(), "a");
assertEquals(connection.getSchema(), "default");
assertEquals(connection.getSchema(), TEST_CATALOG);

connection = DriverManager.getConnection(prefix + "/", "test", null);
assertEquals(connection.getCatalog(), "default");
assertEquals(connection.getSchema(), "default");
assertEquals(connection.getCatalog(), TEST_CATALOG);
assertEquals(connection.getSchema(), TEST_CATALOG);

connection = DriverManager.getConnection(prefix + "", "test", null);
assertEquals(connection.getCatalog(), "default");
assertEquals(connection.getSchema(), "default");
connection = DriverManager.getConnection(prefix, "test", null);
assertEquals(connection.getCatalog(), TEST_CATALOG);
assertEquals(connection.getSchema(), TEST_CATALOG);
}

@Test
public void testConnectionWithCatalogAndSchema()
throws Exception
{
try (Connection connection = createConnection("default", "information_schema")) {
try (Connection connection = createConnection(TEST_CATALOG, "information_schema")) {
try (Statement statement = connection.createStatement()) {
try (ResultSet rs = statement.executeQuery("" +
"SELECT table_catalog, table_schema " +
Expand All @@ -781,7 +782,7 @@ public void testConnectionWithCatalogAndSchema()
assertEquals(metadata.getColumnLabel(1), "table_catalog");
assertEquals(metadata.getColumnLabel(2), "table_schema");
assertTrue(rs.next());
assertEquals(rs.getString("table_catalog"), "default");
assertEquals(rs.getString("table_catalog"), TEST_CATALOG);
}
}
}
Expand All @@ -791,7 +792,7 @@ public void testConnectionWithCatalogAndSchema()
public void testConnectionWithCatalog()
throws Exception
{
try (Connection connection = createConnection("default")) {
try (Connection connection = createConnection(TEST_CATALOG)) {
try (Statement statement = connection.createStatement()) {
try (ResultSet rs = statement.executeQuery("" +
"SELECT table_catalog, table_schema " +
Expand All @@ -802,7 +803,7 @@ public void testConnectionWithCatalog()
assertEquals(metadata.getColumnLabel(1), "table_catalog");
assertEquals(metadata.getColumnLabel(2), "table_schema");
assertTrue(rs.next());
assertEquals(rs.getString("table_catalog"), "default");
assertEquals(rs.getString("table_catalog"), TEST_CATALOG);
}
}
}
Expand Down
6 changes: 2 additions & 4 deletions presto-main/src/test/java/com/facebook/presto/operator/scalar/TestDateTimeFunctions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
import java.util.Locale;
import java.util.TimeZone;

import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
import static com.facebook.presto.spi.Session.DEFAULT_SCHEMA;
import static com.facebook.presto.spi.type.TimeZoneKey.getTimeZoneKey;
import static com.facebook.presto.spi.type.TimeZoneKey.getTimeZoneKeyForOffset;
import static com.facebook.presto.util.DateTimeZoneIndex.getDateTimeZone;
Expand Down Expand Up @@ -72,7 +70,7 @@ public class TestDateTimeFunctions
@BeforeClass
public void setUp()
{
session = new Session("user", "test", DEFAULT_CATALOG, DEFAULT_SCHEMA, TIME_ZONE_KEY, Locale.ENGLISH, null, null);
session = new Session("user", "test", "catalog", "schema", TIME_ZONE_KEY, Locale.ENGLISH, null, null);
functionAssertions = new FunctionAssertions(session);
}

Expand Down Expand Up @@ -616,7 +614,7 @@ public void testDateParse()
public void testLocale()
{
Locale locale = Locale.JAPANESE;
session = new Session("user", "test", DEFAULT_CATALOG, DEFAULT_SCHEMA, TIME_ZONE_KEY, locale, null, null);
session = new Session("user", "test", "catalog", "schema", TIME_ZONE_KEY, locale, null, null);

functionAssertions = new FunctionAssertions(session);

Expand Down
4 changes: 1 addition & 3 deletions presto-main/src/test/java/com/facebook/presto/sql/TestExpressionInterpreter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
import java.util.concurrent.TimeUnit;

import static com.facebook.presto.connector.dual.DualMetadata.DUAL_METADATA_MANAGER;
import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
import static com.facebook.presto.spi.Session.DEFAULT_SCHEMA;
import static com.facebook.presto.spi.type.BigintType.BIGINT;
import static com.facebook.presto.spi.type.BooleanType.BOOLEAN;
import static com.facebook.presto.spi.type.DateType.DATE;
Expand All @@ -67,7 +65,7 @@

public class TestExpressionInterpreter
{
private static final Session SESSION = new Session("user", "test", DEFAULT_CATALOG, DEFAULT_SCHEMA, UTC_KEY, Locale.ENGLISH, null, null);
private static final Session SESSION = new Session("user", "test", "catalog", "schema", UTC_KEY, Locale.ENGLISH, null, null);
private static final Map<Symbol, Type> SYMBOL_TYPES = ImmutableMap.<Symbol, Type>builder()
.put(new Symbol("bound_long"), BIGINT)
.put(new Symbol("bound_string"), VARCHAR)
Expand Down
4 changes: 1 addition & 3 deletions presto-main/src/test/java/com/facebook/presto/sql/planner/TestInterpretedFilterFunction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@

import static com.facebook.presto.connector.dual.DualMetadata.DUAL_METADATA_MANAGER;
import static com.facebook.presto.operator.scalar.FunctionAssertions.createExpression;
import static com.facebook.presto.spi.Session.DEFAULT_CATALOG;
import static com.facebook.presto.spi.Session.DEFAULT_SCHEMA;
import static com.facebook.presto.spi.type.TimeZoneKey.UTC_KEY;
import static java.lang.String.format;
import static org.testng.Assert.assertEquals;
Expand Down Expand Up @@ -195,7 +193,7 @@ public void testComparisonExpressionWithNulls()
public static void assertFilter(String expression, boolean expectedValue)
{
Expression parsed = createExpression(expression, DUAL_METADATA_MANAGER, ImmutableMap.<Symbol, Type>of());
Session session = new Session("user", "test", DEFAULT_CATALOG, DEFAULT_SCHEMA, UTC_KEY, Locale.ENGLISH, null, null);
Session session = new Session("user", "test", "catalog", "schema", UTC_KEY, Locale.ENGLISH, null, null);

InterpretedFilterFunction filterFunction = new InterpretedFilterFunction(parsed,
ImmutableMap.<Symbol, Type>of(),
Expand Down
Loading

0 comments on commit 62b970c

Please sign in to comment.