Skip to content

[BEAM-10572] Eliminate nullability errors from :sdks:java:extensions:sql:datacatalog #12366

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

Merged
kennknowles merged 2 commits into from
Aug 11, 2020
Merged

[BEAM-10572] Eliminate nullability errors from :sdks:java:extensions:sql:datacatalog #12366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a7f729
[BEAM-10572] Eliminate nullability errors from :sdks:java:extensions:…
Jul 24, 2020
8b3877f
[BEAM-10572] Eliminate nullability errors from :sdks:java:extensions:…
Jul 25, 2020
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 sdks/java/extensions/sql/datacatalog/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import groovy.json.JsonOutput

plugins { id 'org.apache.beam.module' }

applyJavaNature(enableChecker:false,automaticModuleName: 'org.apache.beam.sdk.extensions.sql.datacatalog')
applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.extensions.sql.datacatalog')

dependencies {
compile(library.java.google_cloud_datacatalog_v1beta1) {
Expand Down
10 changes: 7 additions & 3 deletions ...rg/apache/beam/sdk/extensions/sql/meta/provider/datacatalog/DataCatalogTableProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public Map<String, Table> getTables() {
}

@Override
public @Nullable Table getTableByFullName(TableName fullTableName) {
public Table getTableByFullName(TableName fullTableName) {

ImmutableList<String> allNameParts =
ImmutableList.<String>builder()
Expand All @@ -116,10 +116,14 @@ public Map<String, Table> getTables() {

@Override
public BeamSqlTable buildBeamSqlTable(Table table) {
return DELEGATE_PROVIDERS.get(table.getType()).buildBeamSqlTable(table);
TableProvider tableProvider = DELEGATE_PROVIDERS.get(table.getType());
if (tableProvider == null) {
throw new RuntimeException("TableProvider is null");
}
return tableProvider.buildBeamSqlTable(table);
}

private @Nullable Table loadTable(String tableName) {
private Table loadTable(String tableName) {
if (!tableCache.containsKey(tableName)) {
tableCache.put(tableName, loadTableFromDC(tableName));
}
Expand Down
4 changes: 3 additions & 1 deletion ...a/org/apache/beam/sdk/extensions/sql/meta/provider/datacatalog/DataCatalogBigQueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,11 @@ public static Iterable<Object[]> dialects() {
});
}

@SuppressWarnings("initialization.fields.uninitialized")
@Parameterized.Parameter(0)
public String dialectName;

@SuppressWarnings("initialization.fields.uninitialized")
@Parameterized.Parameter(1)
public Class<? extends QueryPlanner> queryPlanner;

Expand All @@ -95,7 +97,7 @@ public void testRead() throws Exception {
readPipeline
.getOptions()
.as(BeamSqlPipelineOptions.class)
.setPlannerName(queryPlanner.getCanonicalName());
.setPlannerName(queryPlanner.getName());

try (DataCatalogTableProvider tableProvider =
DataCatalogTableProvider.create(
Expand Down
3 changes: 2 additions & 1 deletion ...tensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamCalciteSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaPlus;
import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.SchemaVersion;
import org.apache.beam.vendor.calcite.v1_20_0.org.apache.calcite.schema.Schemas;
import org.checkerframework.checker.nullness.qual.Nullable;

/** Adapter from {@link TableProvider} to {@link Schema}. */
public class BeamCalciteSchema implements Schema {
Expand Down Expand Up @@ -89,7 +90,7 @@ public Set<String> getTableNames() {
}

@Override
public RelProtoDataType getType(String name) {
public @Nullable RelProtoDataType getType(String name) {
return null;
}

Expand Down