better types

benchmarks/src/test/java/org/apache/druid/benchmark/ExpressionSelectorBenchmark.java

@@ -37,6 +37,7 @@
 import org.apache.druid.segment.QueryableIndexStorageAdapter;
 import org.apache.druid.segment.VirtualColumns;
 import org.apache.druid.segment.column.ColumnHolder;
+import org.apache.druid.segment.column.ColumnType;
 import org.apache.druid.segment.column.ValueType;
 import org.apache.druid.segment.generator.GeneratorColumnSchema;
 import org.apache.druid.segment.generator.GeneratorSchemaInfo;
@@ -145,7 +146,7 @@ public void timeFloorUsingExpression(Blackhole blackhole)
                 new ExpressionVirtualColumn(
                     "v",
                     "timestamp_floor(__time, 'PT1H')",
-                    ValueType.LONG,
+                    ColumnType.LONG,
                     TestExprMacroTable.INSTANCE
                 )
             )
@@ -239,7 +240,7 @@ public void timeFormatUsingExpression(Blackhole blackhole)
                 new ExpressionVirtualColumn(
                     "v",
                     "timestamp_format(__time, 'yyyy-MM-dd')",
-                    ValueType.STRING,
+                    ColumnType.STRING,
                     TestExprMacroTable.INSTANCE
                 )
             )
@@ -304,7 +305,7 @@ public void strlenUsingExpressionAsLong(Blackhole blackhole)
                 new ExpressionVirtualColumn(
                     "v",
                     "strlen(s)",
-                    ValueType.STRING,
+                    ColumnType.STRING,
                     TestExprMacroTable.INSTANCE
                 )
             )
@@ -336,7 +337,7 @@ public void strlenUsingExpressionAsString(Blackhole blackhole)
                 new ExpressionVirtualColumn(
                     "v",
                     "strlen(s)",
-                    ValueType.STRING,
+                    ColumnType.STRING,
                     TestExprMacroTable.INSTANCE
                 )
             )
@@ -350,7 +351,7 @@ public void strlenUsingExpressionAsString(Blackhole blackhole)
         .map(cursor -> {
           final DimensionSelector selector = cursor
               .getColumnSelectorFactory()
-              .makeDimensionSelector(new DefaultDimensionSpec("v", "v", ValueType.STRING));
+              .makeDimensionSelector(new DefaultDimensionSpec("v", "v", ColumnType.STRING));
 
           consumeDimension(cursor, selector, blackhole);
           return null;
@@ -397,7 +398,7 @@ public void arithmeticOnLong(Blackhole blackhole)
                 new ExpressionVirtualColumn(
                     "v",
                     "n + 1",
-                    ValueType.LONG,
+                    ColumnType.LONG,
                     TestExprMacroTable.INSTANCE
                 )
             )
@@ -429,7 +430,7 @@ public void stringConcatAndCompareOnLong(Blackhole blackhole)
                 new ExpressionVirtualColumn(
                     "v",
                     "concat(n, ' is my favorite number') == '3 is my favorite number'",
-                    ValueType.LONG,
+                    ColumnType.LONG,
                     TestExprMacroTable.INSTANCE
                 )
             )

benchmarks/src/test/java/org/apache/druid/benchmark/ExpressionVectorSelectorBenchmark.java

@@ -27,6 +27,7 @@
 import org.apache.druid.math.expr.Expr;
 import org.apache.druid.math.expr.ExprMacroTable;
 import org.apache.druid.math.expr.ExprType;
+import org.apache.druid.math.expr.ExpressionType;
 import org.apache.druid.math.expr.Parser;
 import org.apache.druid.query.expression.TestExprMacroTable;
 import org.apache.druid.segment.ColumnInspector;
@@ -102,7 +103,7 @@ public class ExpressionVectorSelectorBenchmark
   private Closer closer;
 
   @Nullable
-  private ExprType outputType;
+  private ExpressionType outputType;
 
   @Setup(Level.Trial)
   public void setup()
@@ -155,7 +156,7 @@ public void scan(Blackhole blackhole)
             new ExpressionVirtualColumn(
                 "v",
                 expression,
-                ExprType.toValueType(outputType),
+                ExpressionType.toColumnType(outputType),
                 TestExprMacroTable.INSTANCE
             )
         )
@@ -171,7 +172,7 @@ public void scan(Blackhole blackhole)
       );
       if (outputType.isNumeric()) {
         VectorValueSelector selector = cursor.getColumnSelectorFactory().makeValueSelector("v");
-        if (outputType.equals(ExprType.DOUBLE)) {
+        if (outputType.is(ExprType.DOUBLE)) {
           while (!cursor.isDone()) {
             blackhole.consume(selector.getDoubleVector());
             blackhole.consume(selector.getNullVector());

benchmarks/src/test/java/org/apache/druid/benchmark/JoinAndLookupBenchmark.java

@@ -42,7 +42,7 @@
 import org.apache.druid.segment.Segment;
 import org.apache.druid.segment.VirtualColumns;
 import org.apache.druid.segment.column.ColumnConfig;
-import org.apache.druid.segment.column.ValueType;
+import org.apache.druid.segment.column.ColumnType;
 import org.apache.druid.segment.data.IndexedInts;
 import org.apache.druid.segment.join.HashJoinSegment;
 import org.apache.druid.segment.join.JoinConditionAnalysis;
@@ -319,13 +319,13 @@ public Optional<LookupExtractorFactoryContainer> get(String lookupName)
             new ExpressionVirtualColumn(
                 LOOKUP_COUNTRY_CODE_TO_NAME,
                 "lookup(countryIsoCode, '" + LOOKUP_COUNTRY_CODE_TO_NAME + "')",
-                ValueType.STRING,
+                ColumnType.STRING,
                 exprMacroTable
             ),
             new ExpressionVirtualColumn(
                 LOOKUP_COUNTRY_NUMBER_TO_NAME,
                 "lookup(countryNumber, '" + LOOKUP_COUNTRY_NUMBER_TO_NAME + "')",
-                ValueType.STRING,
+                ColumnType.STRING,
                 exprMacroTable
             )
         )

benchmarks/src/test/java/org/apache/druid/benchmark/compression/ColumnarLongsEncodeDataFromSegmentBenchmark.java

@@ -128,9 +128,8 @@ private void initializeSegmentValueIntermediaryFile() throws IOException
         Iterables.addAll(columnNames, index.getColumnNames());
         final ColumnHolder column = index.getColumnHolder(columnName);
         final ColumnCapabilities capabilities = column.getCapabilities();
-        final ValueType columnType = capabilities.getType();
         try (Writer writer = Files.newBufferedWriter(dataFile.toPath(), StandardCharsets.UTF_8)) {
-          if (columnType != ValueType.LONG) {
+          if (!capabilities.is(ValueType.LONG)) {
             throw new RuntimeException("Invalid column type, expected 'Long'");
           }
           LongsColumn theColumn = (LongsColumn) column.getColumn();

benchmarks/src/test/java/org/apache/druid/benchmark/query/GroupByBenchmark.java

@@ -81,7 +81,7 @@
 import org.apache.druid.segment.QueryableIndex;
 import org.apache.druid.segment.QueryableIndexSegment;
 import org.apache.druid.segment.column.ColumnConfig;
-import org.apache.druid.segment.column.ValueType;
+import org.apache.druid.segment.column.ColumnType;
 import org.apache.druid.segment.generator.DataGenerator;
 import org.apache.druid.segment.generator.GeneratorBasicSchemas;
 import org.apache.druid.segment.generator.GeneratorSchemaInfo;
@@ -333,7 +333,7 @@ private void setupQueries()
           .builder()
           .setDataSource("blah")
           .setQuerySegmentSpec(intervalSpec)
-          .setDimensions(new DefaultDimensionSpec("dimSequential", "dimSequential", ValueType.STRING))
+          .setDimensions(new DefaultDimensionSpec("dimSequential", "dimSequential", ColumnType.STRING))
           .setAggregatorSpecs(
               queryAggs
           )
@@ -359,7 +359,7 @@ private void setupQueries()
           .builder()
           .setDataSource("blah")
           .setQuerySegmentSpec(intervalSpec)
-          .setDimensions(new DefaultDimensionSpec("dimSequential", "dimSequential", ValueType.LONG))
+          .setDimensions(new DefaultDimensionSpec("dimSequential", "dimSequential", ColumnType.LONG))
           .setAggregatorSpecs(
               queryAggs
           )
@@ -385,7 +385,7 @@ private void setupQueries()
           .builder()
           .setDataSource("blah")
           .setQuerySegmentSpec(intervalSpec)
-          .setDimensions(new DefaultDimensionSpec("dimSequential", "dimSequential", ValueType.FLOAT))
+          .setDimensions(new DefaultDimensionSpec("dimSequential", "dimSequential", ColumnType.FLOAT))
           .setAggregatorSpecs(queryAggs)
           .setGranularity(Granularity.fromString(queryGranularity))
           .setContext(ImmutableMap.of("vectorize", vectorize))
@@ -411,7 +411,7 @@ private void setupQueries()
           .builder()
           .setDataSource("blah")
           .setQuerySegmentSpec(intervalSpec)
-          .setDimensions(new DefaultDimensionSpec("stringZipf", "stringZipf", ValueType.STRING))
+          .setDimensions(new DefaultDimensionSpec("stringZipf", "stringZipf", ColumnType.STRING))
           .setAggregatorSpecs(
               queryAggs
           )

core/src/main/java/org/apache/druid/data/input/impl/DimensionSchema.java

@@ -29,7 +29,7 @@
 import org.apache.druid.guice.annotations.PublicApi;
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.java.util.emitter.EmittingLogger;
-import org.apache.druid.segment.column.ValueType;
+import org.apache.druid.segment.column.ColumnType;
 
 import java.util.Objects;
 
@@ -126,7 +126,7 @@ public boolean hasBitmapIndex()
   public abstract String getTypeName();
 
   @JsonIgnore
-  public abstract ValueType getValueType();
+  public abstract ColumnType getColumnType();
 
   @Override
   public boolean equals(final Object o)
@@ -141,22 +141,22 @@ public boolean equals(final Object o)
     return createBitmapIndex == that.createBitmapIndex &&
            Objects.equals(name, that.name) &&
            Objects.equals(getTypeName(), that.getTypeName()) &&
-           Objects.equals(getValueType(), that.getValueType()) &&
+           Objects.equals(getColumnType(), that.getColumnType()) &&
            multiValueHandling == that.multiValueHandling;
   }
 
   @Override
   public int hashCode()
   {
-    return Objects.hash(name, multiValueHandling, createBitmapIndex, getTypeName(), getValueType());
+    return Objects.hash(name, multiValueHandling, createBitmapIndex, getTypeName(), getColumnType());
   }
 
   @Override
   public String toString()
   {
     return "DimensionSchema{" +
            "name='" + name + '\'' +
-           ", valueType=" + getValueType() +
+           ", valueType=" + getColumnType() +
            ", typeName=" + getTypeName() +
            ", multiValueHandling=" + multiValueHandling +
            ", createBitmapIndex=" + createBitmapIndex +

core/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java

@@ -21,7 +21,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.druid.segment.column.ValueType;
+import org.apache.druid.segment.column.ColumnType;
 
 public class DoubleDimensionSchema extends DimensionSchema
 {
@@ -38,8 +38,8 @@ public String getTypeName()
   }
 
   @Override
-  public ValueType getValueType()
+  public ColumnType getColumnType()
   {
-    return ValueType.DOUBLE;
+    return ColumnType.DOUBLE;
   }
 }

core/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java

@@ -22,7 +22,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.druid.segment.column.ValueType;
+import org.apache.druid.segment.column.ColumnType;
 
 public class FloatDimensionSchema extends DimensionSchema
 {
@@ -42,8 +42,8 @@ public String getTypeName()
 
   @Override
   @JsonIgnore
-  public ValueType getValueType()
+  public ColumnType getColumnType()
   {
-    return ValueType.FLOAT;
+    return ColumnType.FLOAT;
   }
 }

core/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java

@@ -22,7 +22,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.druid.segment.column.ValueType;
+import org.apache.druid.segment.column.ColumnType;
 
 
 public class LongDimensionSchema extends DimensionSchema
@@ -43,8 +43,8 @@ public String getTypeName()
 
   @Override
   @JsonIgnore
-  public ValueType getValueType()
+  public ColumnType getColumnType()
   {
-    return ValueType.LONG;
+    return ColumnType.LONG;
   }
 }

core/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java

@@ -22,7 +22,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.druid.segment.column.ValueType;
+import org.apache.druid.segment.column.ColumnType;
 
 import java.util.List;
 
@@ -62,9 +62,9 @@ public String getTypeName()
 
   @Override
   @JsonIgnore
-  public ValueType getValueType()
+  public ColumnType getColumnType()
   {
-    return ValueType.STRING;
+    return ColumnType.STRING;
   }
 
   @Override

core/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java

@@ -22,7 +22,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.druid.segment.column.ValueType;
+import org.apache.druid.segment.column.ColumnType;
 
 public class StringDimensionSchema extends DimensionSchema
 {
@@ -57,8 +57,8 @@ public String getTypeName()
 
   @Override
   @JsonIgnore
-  public ValueType getValueType()
+  public ColumnType getColumnType()
   {
-    return ValueType.STRING;
+    return ColumnType.STRING;
   }
 }