WIP: core

Author: vlsi

core/src/main/java/org/apache/calcite/adapter/clone/ArrayTable.java

@@ -41,6 +41,8 @@
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+
 import java.lang.reflect.Array;
 import java.lang.reflect.Type;
 import java.util.AbstractList;
@@ -82,9 +84,9 @@ class ArrayTable extends AbstractQueryableTable implements ScannableTable {
     return Statistics.of(content.size, keys, content.collations);
   }
 
-  @Override public Enumerable<Object[]> scan(DataContext root) {
-    return new AbstractEnumerable<Object[]>() {
-      @Override public Enumerator<Object[]> enumerator() {
+  @Override public Enumerable<@Nullable Object[]> scan(DataContext root) {
+    return new AbstractEnumerable<@Nullable Object[]>() {
+      @Override public Enumerator<@Nullable Object[]> enumerator() {
         final Content content = supplier.get();
         return content.arrayEnumerator();
       }
@@ -225,7 +227,7 @@ public static List asList(final Representation representation,
       // Cache size. It might be expensive to compute.
       final int size = representation.size(dataSet);
       return new AbstractList() {
-        @Override public Object get(int index) {
+        @Override public @Nullable Object get(int index) {
           return representation.getObject(dataSet, index);
         }
 
@@ -243,9 +245,9 @@ public interface Representation {
 
     /** Converts a value set into a compact representation. If
      * {@code sources} is not null, permutes. */
-    Object freeze(ColumnLoader.ValueSet valueSet, int[] sources);
+    Object freeze(ColumnLoader.ValueSet valueSet, int @Nullable [] sources);
 
-    Object getObject(Object dataSet, int ordinal);
+    @Nullable Object getObject(Object dataSet, int ordinal);
     int getInt(Object dataSet, int ordinal);
 
     /** Creates a data set that is the same as a given data set
@@ -277,7 +279,7 @@ public static class ObjectArray implements Representation {
       return RepresentationType.OBJECT_ARRAY;
     }
 
-    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int[] sources) {
+    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int @Nullable [] sources) {
       // We assume the values have been canonized.
       final List<Comparable> list = permuteList(valueSet.values, sources);
       return list.toArray(new Comparable[0]);
@@ -334,7 +336,7 @@ public static class PrimitiveArray implements Representation {
       return RepresentationType.PRIMITIVE_ARRAY;
     }
 
-    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int[] sources) {
+    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int @Nullable [] sources) {
       //noinspection unchecked
       return primitive.toArray2(
           permuteList((List) valueSet.values, sources));
@@ -344,7 +346,7 @@ public static class PrimitiveArray implements Representation {
       return primitive.permute(dataSet, sources);
     }
 
-    @Override public Object getObject(Object dataSet, int ordinal) {
+    @Override public @Nullable Object getObject(Object dataSet, int ordinal) {
       return p.arrayItem(dataSet, ordinal);
     }
 
@@ -375,7 +377,7 @@ public static class PrimitiveDictionary implements Representation {
       return RepresentationType.PRIMITIVE_DICTIONARY;
     }
 
-    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int[] sources) {
+    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int @Nullable [] sources) {
       throw new UnsupportedOperationException(); // TODO:
     }
 
@@ -423,7 +425,7 @@ public static class ObjectDictionary implements Representation {
       return RepresentationType.OBJECT_DICTIONARY;
     }
 
-    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int[] sources) {
+    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int @Nullable [] sources) {
       final int n = valueSet.map.keySet().size();
       int extra = valueSet.containsNull ? 1 : 0;
       Comparable[] codeValues =
@@ -486,7 +488,7 @@ public static class StringDictionary implements Representation {
       return RepresentationType.STRING_DICTIONARY;
     }
 
-    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int[] sources) {
+    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int @Nullable [] sources) {
       throw new UnsupportedOperationException(); // TODO:
     }
 
@@ -524,7 +526,7 @@ public static class ByteStringDictionary implements Representation {
       return RepresentationType.BYTE_STRING_DICTIONARY;
     }
 
-    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int[] sources) {
+    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int @Nullable [] sources) {
       throw new UnsupportedOperationException(); // TODO:
     }
 
@@ -565,7 +567,7 @@ public static class Constant implements Representation {
       return RepresentationType.CONSTANT;
     }
 
-    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int[] sources) {
+    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int @Nullable [] sources) {
       final int size = valueSet.values.size();
       return Pair.of(size == 0 ? null : valueSet.values.get(0), size);
     }
@@ -626,7 +628,7 @@ public static class BitSlicedPrimitiveArray implements Representation {
       return RepresentationType.BIT_SLICED_PRIMITIVE_ARRAY;
     }
 
-    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int[] sources) {
+    @Override public Object freeze(ColumnLoader.ValueSet valueSet, int @Nullable [] sources) {
       final int chunksPerWord = 64 / bitCount;
       final List<Comparable> valueList =
           permuteList(valueSet.values, sources);
@@ -783,7 +785,7 @@ public static void orLong(
   }
 
   private static <E> List<E> permuteList(
-      final List<E> list, final int[] sources) {
+      final List<E> list, final int @Nullable [] sources) {
     if (sources == null) {
       return list;
     }
@@ -828,13 +830,13 @@ public <T> Enumerator<T> enumerator() {
       }
     }
 
-    public Enumerator<Object[]> arrayEnumerator() {
+    public Enumerator<@Nullable Object[]> arrayEnumerator() {
       return new ArrayEnumerator(size, columns);
     }
 
     /** Enumerator over a table with a single column; each element
      * returned is an object. */
-    private static class ObjectEnumerator implements Enumerator<Object> {
+    private static class ObjectEnumerator implements Enumerator<@Nullable Object> {
       final int rowCount;
       final Object dataSet;
       final Representation representation;
@@ -846,7 +848,7 @@ private static class ObjectEnumerator implements Enumerator<Object> {
         this.representation = column.representation;
       }
 
-      @Override public Object current() {
+      @Override public @Nullable Object current() {
         return representation.getObject(dataSet, i);
       }
 
@@ -864,7 +866,7 @@ private static class ObjectEnumerator implements Enumerator<Object> {
 
     /** Enumerator over a table with more than one column; each element
      * returned is an array. */
-    private static class ArrayEnumerator implements Enumerator<Object[]> {
+    private static class ArrayEnumerator implements Enumerator<@Nullable Object[]> {
       final int rowCount;
       final List<Column> columns;
       int i = -1;
@@ -874,8 +876,8 @@ private static class ArrayEnumerator implements Enumerator<Object[]> {
         this.columns = columns;
       }
 
-      @Override public Object[] current() {
-        Object[] objects = new Object[columns.size()];
+      @Override public @Nullable Object[] current() {
+        @Nullable Object[] objects = new Object[columns.size()];
         for (int j = 0; j < objects.length; j++) {
           final Column pair = columns.get(j);
           objects[j] = pair.representation.getObject(pair.dataSet, i);

core/src/main/java/org/apache/calcite/adapter/clone/ColumnLoader.java

@@ -232,14 +232,14 @@ private void load(final RelDataType elementType,
    * value needs to be converted to a {@link Long}. Similarly
    * {@link java.sql.Date} and {@link java.sql.Time} values to
    * {@link Integer}. */
-  private static List wrap(ColumnMetaData.Rep rep, List list,
+  private static List<? extends @Nullable Object> wrap(ColumnMetaData.Rep rep, List<?> list,
       RelDataType type) {
     switch (type.getSqlTypeName()) {
     case TIMESTAMP:
       switch (rep) {
       case OBJECT:
       case JAVA_SQL_TIMESTAMP:
-        return Util.transform(list,
+        return Util.transform((List<@Nullable Timestamp>) list,
             (Timestamp t) -> t == null ? null : t.getTime());
       default:
         break;
@@ -249,7 +249,7 @@ private static List wrap(ColumnMetaData.Rep rep, List list,
       switch (rep) {
       case OBJECT:
       case JAVA_SQL_TIME:
-        return Util.transform(list, (Time t) -> t == null
+        return Util.transform((List<@Nullable Time>) list, (Time t) -> t == null
             ? null
             : (int) (t.getTime() % DateTimeUtils.MILLIS_PER_DAY));
       default:
@@ -260,7 +260,7 @@ private static List wrap(ColumnMetaData.Rep rep, List list,
       switch (rep) {
       case OBJECT:
       case JAVA_SQL_DATE:
-        return Util.transform(list, (Date d) -> d == null
+        return Util.<@Nullable Date, @Nullable Integer>transform((List<@Nullable Date>) list, (Date d) -> d == null
             ? null
             : (int) (d.getTime() / DateTimeUtils.MILLIS_PER_DAY));
       default:

core/src/main/java/org/apache/calcite/adapter/enumerable/AggResultContext.java

@@ -19,6 +19,8 @@
 import org.apache.calcite.linq4j.tree.Expression;
 import org.apache.calcite.rel.core.AggregateCall;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+
 /**
  * Information for a call to
  * {@link AggImplementor#implementResult(AggContext, AggResultContext)}
@@ -32,7 +34,7 @@ public interface AggResultContext extends NestedBlockBuilder, AggResetContext {
    * accumulator were aggregated. Most aggregate functions depend on only the
    * accumulator, but quasi-aggregate functions such as GROUPING access at the
    * key. */
-  Expression key();
+  @Nullable Expression key();
 
   /** Returns an expression that references the {@code i}th field of the key,
    * cast to the appropriate type. */