Skip to content

Commit

Permalink
Rename #bucket_number to #bucket
Browse files Browse the repository at this point in the history
  • Loading branch information
Igor Demura committed Nov 17, 2016
1 parent b080503 commit ce85ef3
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions presto-hive/src/main/java/com/facebook/presto/hive/HiveBucketing.java
View file
Expand Up @@ -49,7 +49,7 @@
import java.util.Set;
import java.util.stream.Collectors;

import static com.facebook.presto.hive.HiveColumnHandle.BUCKET_NUMBER_COLUMN_NAME;
import static com.facebook.presto.hive.HiveColumnHandle.BUCKET_COLUMN_NAME;
import static com.facebook.presto.hive.HiveErrorCode.HIVE_INVALID_METADATA;
import static com.facebook.presto.hive.HiveUtil.getRegularColumnHandles;
import static com.facebook.presto.hive.HiveUtil.getTableStructFields;
Expand Down Expand Up @@ -232,7 +232,7 @@ public static List<HiveBucket> getHiveBucketNumbers(Table table, TupleDomain<Col
return ImmutableList.of();
}
Optional<Domain> domain = effectivePredicate.getDomains().get().entrySet().stream()
.filter(entry -> ((HiveColumnHandle) entry.getKey()).getName().equals(BUCKET_NUMBER_COLUMN_NAME))
.filter(entry -> ((HiveColumnHandle) entry.getKey()).getName().equals(BUCKET_COLUMN_NAME))
.findFirst()
.map(Entry::getValue);
if (!domain.isPresent()) {
Expand Down
16 changes: 8 additions & 8 deletions presto-hive/src/main/java/com/facebook/presto/hive/HiveColumnHandle.java
View file
Expand Up @@ -41,10 +41,10 @@ public class HiveColumnHandle
public static final HiveType PATH_HIVE_TYPE = HIVE_STRING;
public static final TypeSignature PATH_TYPE_SIGNATURE = PATH_HIVE_TYPE.getTypeSignature();

public static final int BUCKET_NUMBER_COLUMN_INDEX = -12;
public static final String BUCKET_NUMBER_COLUMN_NAME = "$bucket_number";
public static final HiveType BUCKET_NUMBER_HIVE_TYPE = HIVE_INT;
public static final TypeSignature BUCKET_NUMBER_TYPE_SIGNATURE = BUCKET_NUMBER_HIVE_TYPE.getTypeSignature();
public static final int BUCKET_COLUMN_INDEX = -12;
public static final String BUCKET_COLUMN_NAME = "$bucket";
public static final HiveType BUCKET_HIVE_TYPE = HIVE_INT;
public static final TypeSignature BUCKET_TYPE_SIGNATURE = BUCKET_HIVE_TYPE.getTypeSignature();

private static final String UPDATE_ROW_ID_COLUMN_NAME = "$shard_row_id";

Expand Down Expand Up @@ -187,18 +187,18 @@ public static HiveColumnHandle pathColumnHandle(String connectorId)
return new HiveColumnHandle(connectorId, PATH_COLUMN_NAME, PATH_HIVE_TYPE, PATH_TYPE_SIGNATURE, PATH_COLUMN_INDEX, HIDDEN);
}

public static HiveColumnHandle bucketNumberColumnHandle(String connectorId)
public static HiveColumnHandle bucketColumnHandle(String connectorId)
{
return new HiveColumnHandle(connectorId, BUCKET_NUMBER_COLUMN_NAME, BUCKET_NUMBER_HIVE_TYPE, BUCKET_NUMBER_TYPE_SIGNATURE, BUCKET_NUMBER_COLUMN_INDEX, HIDDEN);
return new HiveColumnHandle(connectorId, BUCKET_COLUMN_NAME, BUCKET_HIVE_TYPE, BUCKET_TYPE_SIGNATURE, BUCKET_COLUMN_INDEX, HIDDEN);
}

public static boolean isPathColumnHandle(HiveColumnHandle column)
{
return column.getHiveColumnIndex() == PATH_COLUMN_INDEX;
}

public static boolean isBucketNumberColumnHandle(HiveColumnHandle column)
public static boolean isBucketColumnHandle(HiveColumnHandle column)
{
return column.getHiveColumnIndex() == BUCKET_NUMBER_COLUMN_INDEX;
return column.getHiveColumnIndex() == BUCKET_COLUMN_INDEX;
}
}
4 changes: 2 additions & 2 deletions presto-hive/src/main/java/com/facebook/presto/hive/HiveMetadata.java
View file
Expand Up @@ -76,7 +76,7 @@
import java.util.function.Predicate;
import java.util.stream.Collectors;

import static com.facebook.presto.hive.HiveColumnHandle.BUCKET_NUMBER_COLUMN_NAME;
import static com.facebook.presto.hive.HiveColumnHandle.BUCKET_COLUMN_NAME;
import static com.facebook.presto.hive.HiveColumnHandle.ColumnType.HIDDEN;
import static com.facebook.presto.hive.HiveColumnHandle.ColumnType.PARTITION_KEY;
import static com.facebook.presto.hive.HiveColumnHandle.ColumnType.REGULAR;
Expand Down Expand Up @@ -1294,7 +1294,7 @@ private static Function<HiveColumnHandle, ColumnMetadata> columnMetadataGetter(T
// add hidden columns
builder.put(PATH_COLUMN_NAME, Optional.empty());
if (table.getStorage().getBucketProperty().isPresent()) {
builder.put(BUCKET_NUMBER_COLUMN_NAME, Optional.empty());
builder.put(BUCKET_COLUMN_NAME, Optional.empty());
}

Map<String, Optional<String>> columnComment = builder.build();
Expand Down
8 changes: 4 additions & 4 deletions presto-hive/src/main/java/com/facebook/presto/hive/HiveUtil.java
View file
Expand Up @@ -77,8 +77,8 @@

import static com.facebook.presto.hive.HiveColumnHandle.ColumnType.PARTITION_KEY;
import static com.facebook.presto.hive.HiveColumnHandle.ColumnType.REGULAR;
import static com.facebook.presto.hive.HiveColumnHandle.bucketNumberColumnHandle;
import static com.facebook.presto.hive.HiveColumnHandle.isBucketNumberColumnHandle;
import static com.facebook.presto.hive.HiveColumnHandle.bucketColumnHandle;
import static com.facebook.presto.hive.HiveColumnHandle.isBucketColumnHandle;
import static com.facebook.presto.hive.HiveColumnHandle.isPathColumnHandle;
import static com.facebook.presto.hive.HiveColumnHandle.pathColumnHandle;
import static com.facebook.presto.hive.HiveErrorCode.HIVE_CANNOT_OPEN_SPLIT;
Expand Down Expand Up @@ -715,7 +715,7 @@ public static List<HiveColumnHandle> hiveColumnHandles(String connectorId, Table
// add hidden columns
columns.add(pathColumnHandle(connectorId));
if (table.getStorage().getBucketProperty().isPresent()) {
columns.add(bucketNumberColumnHandle(connectorId));
columns.add(bucketColumnHandle(connectorId));
}

return columns.build();
Expand Down Expand Up @@ -812,7 +812,7 @@ public static String getPrefilledColumnValue(HiveColumnHandle columnHandle, Hive
if (isPathColumnHandle(columnHandle)) {
return path.toString();
}
if (isBucketNumberColumnHandle(columnHandle)) {
if (isBucketColumnHandle(columnHandle)) {
return String.valueOf(bucketNumber.getAsInt());
}
throw new PrestoException(NOT_SUPPORTED, "unsupported hidden column: " + columnHandle);
Expand Down
24 changes: 12 additions & 12 deletions presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java
View file
Expand Up @@ -49,7 +49,7 @@
import java.util.Optional;
import java.util.function.Function;

import static com.facebook.presto.hive.HiveColumnHandle.BUCKET_NUMBER_COLUMN_NAME;
import static com.facebook.presto.hive.HiveColumnHandle.BUCKET_COLUMN_NAME;
import static com.facebook.presto.hive.HiveColumnHandle.PATH_COLUMN_NAME;
import static com.facebook.presto.hive.HiveQueryRunner.HIVE_CATALOG;
import static com.facebook.presto.hive.HiveQueryRunner.TPCH_SCHEMA;
Expand Down Expand Up @@ -1640,10 +1640,10 @@ private void doTestPathHiddenColumn(Session session, HiveStorageFormat storageFo
}

@Test
public void testBucketNumberHiddenColumn()
public void testBucketHiddenColumn()
throws Exception
{
@Language("SQL") String createTable = "CREATE TABLE test_bucket_number " +
@Language("SQL") String createTable = "CREATE TABLE test_bucket_hidden_column " +
"WITH (" +
"bucketed_by = ARRAY['col0']," +
"bucket_count = 2" +
Expand All @@ -1654,27 +1654,27 @@ public void testBucketNumberHiddenColumn()
"(6, 17), (7, 18), (8, 19)" +
" ) t (col0, col1) ";
assertUpdate(createTable, 9);
assertTrue(queryRunner.tableExists(getSession(), "test_bucket_number"));
assertTrue(queryRunner.tableExists(getSession(), "test_bucket_hidden_column"));

TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, "test_bucket_number");
TableMetadata tableMetadata = getTableMetadata(catalog, TPCH_SCHEMA, "test_bucket_hidden_column");
assertEquals(tableMetadata.getMetadata().getProperties().get(BUCKETED_BY_PROPERTY), ImmutableList.of("col0"));
assertEquals(tableMetadata.getMetadata().getProperties().get(BUCKET_COUNT_PROPERTY), 2);

List<String> columnNames = ImmutableList.of("col0", "col1", PATH_COLUMN_NAME, BUCKET_NUMBER_COLUMN_NAME);
List<String> columnNames = ImmutableList.of("col0", "col1", PATH_COLUMN_NAME, BUCKET_COLUMN_NAME);
List<ColumnMetadata> columnMetadatas = tableMetadata.getColumns();
assertEquals(columnMetadatas.size(), columnNames.size());
for (int i = 0; i < columnMetadatas.size(); i++) {
ColumnMetadata columnMetadata = columnMetadatas.get(i);
assertEquals(columnMetadata.getName(), columnNames.get(i));
if (columnMetadata.getName().equals(BUCKET_NUMBER_COLUMN_NAME)) {
if (columnMetadata.getName().equals(BUCKET_COLUMN_NAME)) {
// $bucket_number should be hidden column
assertTrue(columnMetadata.isHidden());
}
}
assertEquals(getBucketCount("test_bucket_number"), 2);
assertEquals(getBucketCount("test_bucket_hidden_column"), 2);

MaterializedResult results = computeActual(format("SELECT *, \"%1$s\" FROM test_bucket_number WHERE \"%1$s\" = 1",
BUCKET_NUMBER_COLUMN_NAME));
MaterializedResult results = computeActual(format("SELECT *, \"%1$s\" FROM test_bucket_hidden_column WHERE \"%1$s\" = 1",
BUCKET_COLUMN_NAME));
for (int i = 0; i < results.getRowCount(); i++) {
MaterializedRow row = results.getMaterializedRows().get(i);
int col0 = (int) row.getField(0);
Expand All @@ -1689,8 +1689,8 @@ public void testBucketNumberHiddenColumn()
}
assertEquals(results.getRowCount(), 4);

assertUpdate("DROP TABLE test_bucket_number");
assertFalse(queryRunner.tableExists(getSession(), "test_bucket_number"));
assertUpdate("DROP TABLE test_bucket_hidden_column");
assertFalse(queryRunner.tableExists(getSession(), "test_bucket_hidden_column"));
}

@Test
Expand Down

0 comments on commit ce85ef3

Please sign in to comment.