Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various small Phoenix Connector fixes. #4761

Merged
merged 1 commit into from
Aug 10, 2020
Merged

Various small Phoenix Connector fixes. #4761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion presto-docs/src/main/sphinx/connector/phoenix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,6 @@ Property Name Default Value Description

``ttl`` ``FOREVER`` Time To Live for each cell.

``bloomfilter`` ``ROW`` Bloomfilter to use. Valid values are ``NONE``, ``ROW`` (default), or ``ROWCOL``.
``bloomfilter`` ``NONE`` Bloomfilter to use. Valid values are ``NONE`` (default), ``ROW``, or ``ROWCOL``.
=========================== ================ ==============================================================================================================

15 changes: 9 additions & 6 deletions presto-phoenix/src/main/java/io/prestosql/plugin/phoenix/PhoenixMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.io.compress.Compression;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.regionserver.BloomType;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.query.QueryConstants;
Expand Down Expand Up @@ -164,23 +167,23 @@ private Map<String, Object> getTableProperties(ConnectorSession session, JdbcTab
HColumnDescriptor[] columnFamilies = tableDesc.getColumnFamilies();
for (HColumnDescriptor columnFamily : columnFamilies) {
if (columnFamily.getNameAsString().equals(defaultFamilyName)) {
if (!"NONE".equals(columnFamily.getBloomFilterType().toString())) {
properties.put(PhoenixTableProperties.BLOOMFILTER, columnFamily.getBloomFilterType().toString());
if (columnFamily.getBloomFilterType() != BloomType.NONE) {
properties.put(PhoenixTableProperties.BLOOMFILTER, columnFamily.getBloomFilterType());
}
if (columnFamily.getMaxVersions() != 1) {
properties.put(PhoenixTableProperties.VERSIONS, columnFamily.getMaxVersions());
}
if (columnFamily.getMinVersions() > 0) {
properties.put(PhoenixTableProperties.MIN_VERSIONS, columnFamily.getMinVersions());
}
if (!columnFamily.getCompression().toString().equals("NONE")) {
properties.put(PhoenixTableProperties.COMPRESSION, columnFamily.getCompression().toString());
if (columnFamily.getCompression() != Compression.Algorithm.NONE) {
properties.put(PhoenixTableProperties.COMPRESSION, columnFamily.getCompression());
}
if (columnFamily.getTimeToLive() < FOREVER) {
properties.put(PhoenixTableProperties.TTL, columnFamily.getTimeToLive());
}
if (!columnFamily.getDataBlockEncoding().toString().equals("NONE")) {
properties.put(PhoenixTableProperties.DATA_BLOCK_ENCODING, columnFamily.getDataBlockEncoding().toString());
if (columnFamily.getDataBlockEncoding() != DataBlockEncoding.NONE) {
properties.put(PhoenixTableProperties.DATA_BLOCK_ENCODING, columnFamily.getDataBlockEncoding());
}
break;
}
Expand Down
72 changes: 25 additions & 47 deletions presto-phoenix/src/main/java/io/prestosql/plugin/phoenix/PhoenixTableProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@

import com.google.common.collect.ImmutableList;
import io.prestosql.spi.session.PropertyMetadata;
import org.apache.hadoop.hbase.io.compress.Compression;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.regionserver.BloomType;
import org.apache.hadoop.util.StringUtils;

import javax.inject.Inject;
Expand All @@ -26,6 +29,7 @@

import static com.google.common.collect.ImmutableList.toImmutableList;
import static io.prestosql.spi.session.PropertyMetadata.booleanProperty;
import static io.prestosql.spi.session.PropertyMetadata.enumProperty;
import static io.prestosql.spi.session.PropertyMetadata.integerProperty;
import static io.prestosql.spi.session.PropertyMetadata.stringProperty;
import static java.util.Objects.requireNonNull;
Expand Down Expand Up @@ -86,9 +90,10 @@ public PhoenixTableProperties()
"The column family name to use by default.",
null,
false),
stringProperty(
enumProperty(
BLOOMFILTER,
"NONE, ROW or ROWCOL to enable blooms per column family.",
BloomType.class,
null,
false),
integerProperty(
Expand All @@ -101,19 +106,21 @@ public PhoenixTableProperties()
"The minimum number of row versions to store, configured per column family via HColumnDescriptor.",
null,
false),
stringProperty(
enumProperty(
COMPRESSION,
"Compression algorithm to use for HBase blocks. Options are: SNAPPY, GZIP, LZ, and others.",
Compression.Algorithm.class,
null,
false),
integerProperty(
TTL,
"Number of seconds for cell TTL. HBase will automatically delete rows once the expiration time is reached.",
null,
false),
stringProperty(
enumProperty(
DATA_BLOCK_ENCODING,
"The block encoding algorithm to use for Cells in HBase blocks. Options are: NONE, PREFIX, DIFF, FAST_DIFF, ROW_INDEX_V1, and others.",
DataBlockEncoding.class,
null,
false));
}
Expand All @@ -128,23 +135,15 @@ public static Optional<Integer> getSaltBuckets(Map<String, Object> tableProperti
requireNonNull(tableProperties);

Integer value = (Integer) tableProperties.get(SALT_BUCKETS);
if (value == null) {
return Optional.empty();
}

return Optional.of(value);
return Optional.ofNullable(value);
}

public static Optional<String> getSplitOn(Map<String, Object> tableProperties)
{
requireNonNull(tableProperties);

String value = (String) tableProperties.get(SPLIT_ON);
if (value == null) {
return Optional.empty();
}

return Optional.of(value);
return Optional.ofNullable(value);
}

public static Optional<List<String>> getRowkeys(Map<String, Object> tableProperties)
Expand All @@ -166,83 +165,62 @@ public static Optional<Boolean> getDisableWal(Map<String, Object> tablePropertie
requireNonNull(tableProperties);

Boolean value = (Boolean) tableProperties.get(DISABLE_WAL);
if (value == null) {
return Optional.empty();
}
return Optional.of(value);
return Optional.ofNullable(value);
}

public static Optional<Boolean> getImmutableRows(Map<String, Object> tableProperties)
{
requireNonNull(tableProperties);

Boolean value = (Boolean) tableProperties.get(IMMUTABLE_ROWS);
if (value == null) {
return Optional.empty();
}
return Optional.of(value);
return Optional.ofNullable(value);
}

public static Optional<String> getDefaultColumnFamily(Map<String, Object> tableProperties)
{
requireNonNull(tableProperties);

String value = (String) tableProperties.get(DEFAULT_COLUMN_FAMILY);
if (value == null) {
return Optional.empty();
}
return Optional.of(value);
return Optional.ofNullable(value);
}

public static Optional<String> getBloomfilter(Map<String, Object> tableProperties)
public static Optional<BloomType> getBloomfilter(Map<String, Object> tableProperties)
{
requireNonNull(tableProperties);

String value = (String) tableProperties.get(BLOOMFILTER);
if (value == null) {
return Optional.empty();
}
return Optional.of(value);
BloomType value = (BloomType) tableProperties.get(BLOOMFILTER);
return Optional.ofNullable(value);
}

public static Optional<Integer> getVersions(Map<String, Object> tableProperties)
{
requireNonNull(tableProperties);

Integer value = (Integer) tableProperties.get(VERSIONS);
if (value == null) {
return Optional.empty();
}
return Optional.of(value);
return Optional.ofNullable(value);
}

public static Optional<Integer> getMinVersions(Map<String, Object> tableProperties)
{
requireNonNull(tableProperties);

Integer value = (Integer) tableProperties.get(MIN_VERSIONS);
if (value == null) {
return Optional.empty();
}
return Optional.of(value);
return Optional.ofNullable(value);
}

public static Optional<String> getCompression(Map<String, Object> tableProperties)
public static Optional<Compression.Algorithm> getCompression(Map<String, Object> tableProperties)
{
requireNonNull(tableProperties);

String value = (String) tableProperties.get(COMPRESSION);
if (value == null) {
return Optional.empty();
}
return Optional.of(value);
Compression.Algorithm value = (Compression.Algorithm) tableProperties.get(COMPRESSION);
return Optional.ofNullable(value);
}

public static Optional<String> getDataBlockEncoding(Map<String, Object> tableProperties)
public static Optional<DataBlockEncoding> getDataBlockEncoding(Map<String, Object> tableProperties)
{
requireNonNull(tableProperties);

String value = (String) tableProperties.get(DATA_BLOCK_ENCODING);
DataBlockEncoding value = (DataBlockEncoding) tableProperties.get(DATA_BLOCK_ENCODING);
return Optional.ofNullable(value);
}

Expand Down