You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by vo...@apache.org on 2019/12/17 12:48:30 UTC
[drill] 07/12: DRILL-7481: Fix raw type warnings in Iceberg
Metastore and related classes
This is an automated email from the ASF dual-hosted git repository.
volodymyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
commit 2e8619c952449a10fc9aae3722a62346dcd154db
Author: Arina Ielchiieva <ar...@gmail.com>
AuthorDate: Wed Dec 11 12:39:29 2019 +0200
DRILL-7481: Fix raw type warnings in Iceberg Metastore and related classes
closes #1924
---
.../apache/drill/exec/store/ischema/RecordCollector.java | 2 +-
.../org/apache/drill/exec/store/ischema/Records.java | 4 ++--
.../metastore/iceberg/schema/IcebergTableSchema.java | 2 +-
.../iceberg/transform/FilterExpressionVisitor.java | 16 ++++++++--------
.../metastore/components/tables/BasicTablesRequests.java | 2 +-
.../drill/metastore/expressions/FilterExpression.java | 16 ++++++++--------
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/RecordCollector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/RecordCollector.java
index 48c85bf..1d63738 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/RecordCollector.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/RecordCollector.java
@@ -345,7 +345,7 @@ public interface RecordCollector {
String tableName = table.getTableInfo().name();
if (filterEvaluator.shouldVisitColumn(schemaPath, tableName, columnName)) {
- ColumnStatistics columnStatistics =
+ ColumnStatistics<?> columnStatistics =
table.getColumnStatistics(SchemaPath.parseFromString(columnName));
records.add(new Records.Column(IS_CATALOG_NAME, schemaPath, tableName, columnName,
column, columnStatistics, currentIndex, isNested));
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java
index 09f8cee..acb7cb7 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java
@@ -577,7 +577,7 @@ public class Records {
}
public Column(String catalog, String schemaName, String tableName, String columnName,
- ColumnMetadata columnMetadata, ColumnStatistics columnStatistics, int index,
+ ColumnMetadata columnMetadata, ColumnStatistics<?> columnStatistics, int index,
boolean isNested) {
this.TABLE_CATALOG = catalog;
this.TABLE_SCHEMA = schemaName;
@@ -813,4 +813,4 @@ public class Records {
.toInstant());
}
}
-}
\ No newline at end of file
+}
diff --git a/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/schema/IcebergTableSchema.java b/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/schema/IcebergTableSchema.java
index 04665a9..832998a 100644
--- a/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/schema/IcebergTableSchema.java
+++ b/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/schema/IcebergTableSchema.java
@@ -146,7 +146,7 @@ public class IcebergTableSchema {
if (!(type instanceof Class)) {
throw new IcebergMetastoreException("Unexpected generics type: " + type.getTypeName());
}
- Class typeArgument = (Class) type;
+ Class<?> typeArgument = (Class<?>) type;
String typeSimpleName = typeArgument.getSimpleName().toLowerCase();
org.apache.iceberg.types.Type icebergType = JAVA_TO_ICEBERG_TYPE_MAP.get(typeSimpleName);
if (icebergType == null) {
diff --git a/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/transform/FilterExpressionVisitor.java b/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/transform/FilterExpressionVisitor.java
index cad02d5..b582b05 100644
--- a/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/transform/FilterExpressionVisitor.java
+++ b/metastore/iceberg-metastore/src/main/java/org/apache/drill/metastore/iceberg/transform/FilterExpressionVisitor.java
@@ -40,42 +40,42 @@ public class FilterExpressionVisitor implements FilterExpression.Visitor<Express
}
@Override
- public Expression visit(SimplePredicate.Equal expression) {
+ public Expression visit(SimplePredicate.Equal<?> expression) {
return Expressions.equal(expression.reference(), expression.value());
}
@Override
- public Expression visit(SimplePredicate.NotEqual expression) {
+ public Expression visit(SimplePredicate.NotEqual<?> expression) {
return Expressions.notEqual(expression.reference(), expression.value());
}
@Override
- public Expression visit(SimplePredicate.LessThan expression) {
+ public Expression visit(SimplePredicate.LessThan<?> expression) {
return Expressions.lessThan(expression.reference(), expression.value());
}
@Override
- public Expression visit(SimplePredicate.LessThanOrEqual expression) {
+ public Expression visit(SimplePredicate.LessThanOrEqual<?> expression) {
return Expressions.lessThanOrEqual(expression.reference(), expression.value());
}
@Override
- public Expression visit(SimplePredicate.GreaterThan expression) {
+ public Expression visit(SimplePredicate.GreaterThan<?> expression) {
return Expressions.greaterThan(expression.reference(), expression.value());
}
@Override
- public Expression visit(SimplePredicate.GreaterThanOrEqual expression) {
+ public Expression visit(SimplePredicate.GreaterThanOrEqual<?> expression) {
return Expressions.greaterThanOrEqual(expression.reference(), expression.value());
}
@Override
- public Expression visit(ListPredicate.In expression) {
+ public Expression visit(ListPredicate.In<?> expression) {
return toInExpression(expression.reference(), expression.values());
}
@Override
- public Expression visit(ListPredicate.NotIn expression) {
+ public Expression visit(ListPredicate.NotIn<?> expression) {
Expression in = toInExpression(expression.reference(), expression.values());
return Expressions.not(in);
}
diff --git a/metastore/metastore-api/src/main/java/org/apache/drill/metastore/components/tables/BasicTablesRequests.java b/metastore/metastore-api/src/main/java/org/apache/drill/metastore/components/tables/BasicTablesRequests.java
index 84010e5..fbee2d8 100644
--- a/metastore/metastore-api/src/main/java/org/apache/drill/metastore/components/tables/BasicTablesRequests.java
+++ b/metastore/metastore-api/src/main/java/org/apache/drill/metastore/components/tables/BasicTablesRequests.java
@@ -819,7 +819,7 @@ public class BasicTablesRequests {
}
if (value instanceof List) {
- List<?> list = (List) value;
+ List<?> list = (List<?>) value;
if (list.isEmpty()) {
return;
}
diff --git a/metastore/metastore-api/src/main/java/org/apache/drill/metastore/expressions/FilterExpression.java b/metastore/metastore-api/src/main/java/org/apache/drill/metastore/expressions/FilterExpression.java
index 45b75db..784a892 100644
--- a/metastore/metastore-api/src/main/java/org/apache/drill/metastore/expressions/FilterExpression.java
+++ b/metastore/metastore-api/src/main/java/org/apache/drill/metastore/expressions/FilterExpression.java
@@ -58,14 +58,14 @@ public interface FilterExpression {
*/
interface Visitor<T> {
- T visit(SimplePredicate.Equal expression);
- T visit(SimplePredicate.NotEqual expression);
- T visit(SimplePredicate.LessThan expression);
- T visit(SimplePredicate.LessThanOrEqual expression);
- T visit(SimplePredicate.GreaterThan expression);
- T visit(SimplePredicate.GreaterThanOrEqual expression);
- T visit(ListPredicate.In expression);
- T visit(ListPredicate.NotIn expression);
+ T visit(SimplePredicate.Equal<?> expression);
+ T visit(SimplePredicate.NotEqual<?> expression);
+ T visit(SimplePredicate.LessThan<?> expression);
+ T visit(SimplePredicate.LessThanOrEqual<?> expression);
+ T visit(SimplePredicate.GreaterThan<?> expression);
+ T visit(SimplePredicate.GreaterThanOrEqual<?> expression);
+ T visit(ListPredicate.In<?> expression);
+ T visit(ListPredicate.NotIn<?> expression);
T visit(IsPredicate.IsNull expression);
T visit(IsPredicate.IsNotNull expression);
T visit(SingleExpressionPredicate.Not expression);