Skip to content

[WIP] Return proper unenforced constraint for base-jdbc connector #12173

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

Closed
Praveen2112 wants to merge 1 commit into from
Closed

[WIP] Return proper unenforced constraint for base-jdbc connector #12173

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
11 changes: 10 additions & 1 deletion presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.facebook.presto.spi.TableNotFoundException;
import com.facebook.presto.spi.connector.ConnectorMetadata;
import com.facebook.presto.spi.connector.ConnectorOutputMetadata;
import com.facebook.presto.spi.predicate.TupleDomain;
import com.facebook.presto.spi.statistics.ComputedStatistics;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All @@ -43,6 +44,7 @@
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;

import static com.facebook.presto.plugin.jdbc.JdbcUtil.isAcceptedType;
import static com.facebook.presto.spi.StandardErrorCode.PERMISSION_DENIED;
import static com.google.common.base.Preconditions.checkState;
import static java.util.Objects.requireNonNull;
Expand Down Expand Up @@ -84,7 +86,14 @@ public List<ConnectorTableLayoutResult> getTableLayouts(ConnectorSession session
{
JdbcTableHandle tableHandle = (JdbcTableHandle) table;
ConnectorTableLayout layout = new ConnectorTableLayout(new JdbcTableLayoutHandle(tableHandle, constraint.getSummary()));
return ImmutableList.of(new ConnectorTableLayoutResult(layout, constraint.getSummary()));
TupleDomain<ColumnHandle> unenforcedTupleDomain = constraint.getSummary().transform(columnHandle -> {
JdbcColumnHandle jdbcColumnHandle = (JdbcColumnHandle) columnHandle;
if (isAcceptedType(jdbcColumnHandle.getColumnType())) {
return null;
}
return jdbcColumnHandle;
});
return ImmutableList.of(new ConnectorTableLayoutResult(layout, unenforcedTupleDomain));
}

@Override
Expand Down
56 changes: 56 additions & 0 deletions presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.facebook.presto.plugin.jdbc;

import com.facebook.presto.spi.type.BigintType;
import com.facebook.presto.spi.type.BooleanType;
import com.facebook.presto.spi.type.DateType;
import com.facebook.presto.spi.type.DoubleType;
import com.facebook.presto.spi.type.IntegerType;
import com.facebook.presto.spi.type.RealType;
import com.facebook.presto.spi.type.SmallintType;
import com.facebook.presto.spi.type.TimeType;
import com.facebook.presto.spi.type.TimeWithTimeZoneType;
import com.facebook.presto.spi.type.TimestampType;
import com.facebook.presto.spi.type.TimestampWithTimeZoneType;
import com.facebook.presto.spi.type.TinyintType;
import com.facebook.presto.spi.type.Type;
import com.facebook.presto.spi.type.VarcharType;

import static java.util.Objects.requireNonNull;

public class JdbcUtil
{
private JdbcUtil()
{
}

public static boolean isAcceptedType(Type type)
Copy link
Copy Markdown
Contributor

@kokosing kokosing Jan 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be something that every jdbc connector could override.

Copy link
Copy Markdown
Contributor Author

@Praveen2112 Praveen2112 Jan 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So can we push it to BaseJdbcClient so that the jdbc connector can override it.

Copy link
Copy Markdown
Contributor

@kokosing kokosing Jan 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@findepi what do you think about this location?

Copy link
Copy Markdown
Contributor

@findepi findepi Jan 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Praveen2112 the PR i linked before (#12151) refactors the code base around pushdown and already delegates the responsibility to the BaseJdbcClient. I recommend that you base your work on that PR.

Copy link
Copy Markdown
Contributor Author

@Praveen2112 Praveen2112 Jan 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@findepi isAcceptedType in present in QueryBuilder as a private static method can we move it to some Util class so that it could be accessed by JdbcMetadata and QueryBuilder.

Copy link
Copy Markdown
Contributor

@findepi findepi Jan 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Praveen2112 do you mean the code in #12151 ?

Copy link
Copy Markdown
Contributor Author

@Praveen2112 Praveen2112 Jan 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@findepi yes

Copy link
Copy Markdown
Contributor

@findepi findepi Jan 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good. there -- com.facebook.presto.plugin.jdbc.QueryBuilder#isAcceptedType is now an impl detail of QueryBuilder and has no logic.
com.facebook.presto.plugin.jdbc.ColumnMapping#isPredicatePushDownAllowed is where the information now lives

Copy link
Copy Markdown
Contributor Author

@Praveen2112 Praveen2112 Jan 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@findepi Okay so If I am not wrong we would fetch the ColumnMapping from the above API in JdbcClient#toPrestoType and use it to do the constraint check.
The code will be something like this

Optional<ColumnMapping> mapping = client.toPrestoType(session, column.getJdbcTypeHandle())
if (mapping.isPresent() && mapping.get().isPredicatePushDownAllowed()) {
    return null;
}

{
Type validType = requireNonNull(type, "type is null");
return validType.equals(BigintType.BIGINT) ||
validType.equals(TinyintType.TINYINT) ||
validType.equals(SmallintType.SMALLINT) ||
validType.equals(IntegerType.INTEGER) ||
validType.equals(DoubleType.DOUBLE) ||
validType.equals(RealType.REAL) ||
validType.equals(BooleanType.BOOLEAN) ||
validType.equals(DateType.DATE) ||
validType.equals(TimeType.TIME) ||
validType.equals(TimeWithTimeZoneType.TIME_WITH_TIME_ZONE) ||
validType.equals(TimestampType.TIMESTAMP) ||
validType.equals(TimestampWithTimeZoneType.TIMESTAMP_WITH_TIME_ZONE) ||
validType instanceof VarcharType;
}
}