prometheus-emitter

.github/pull_request_template.md

@@ -44,7 +44,7 @@ This PR has:
 - [ ] added Javadocs for most classes and all non-trivial methods. Linked related entities via Javadoc links.
 - [ ] added or updated version, license, or notice information in [licenses.yaml](https://github.com/apache/druid/blob/master/licenses.yaml)
 - [ ] added comments explaining the "why" and the intent of the code wherever would not be obvious for an unfamiliar reader.
-- [ ] added unit tests or modified existing tests to cover new code paths.
+- [ ] added unit tests or modified existing tests to cover new code paths, ensuring the threshold for [code coverage](https://github.com/apache/druid/blob/master/dev/code-review/code-coverage.md) is met.
 - [ ] added integration tests.
 - [ ] been tested in a test Druid cluster.
 

.travis.yml

@@ -166,17 +166,22 @@ jobs:
           project_files="$(echo "${all_files}" | grep "${regex}" || [[ $? == 1 ]])";
           fi
         - for f in ${project_files}; do echo $f; done  # for debugging
-        # Check diff code coverage for the maven projects being tested (retry install in case of network error)
+        # Check diff code coverage for the maven projects being tested (retry install in case of network error).
+        # Currently, the function coverage check is not reliable, so it is disabled.
         - >
           if [ -n "${project_files}" ]; then
           travis_retry npm install @connectis/diff-test-coverage@1.5.3
           && git diff origin/${TRAVIS_BRANCH}...HEAD -- ${project_files}
           | node_modules/.bin/diff-test-coverage
           --coverage "**/target/site/jacoco/jacoco.xml"
           --type jacoco
-          --line-coverage 65
-          --branch-coverage 65
-          --function-coverage 80
+          --line-coverage 50 
+          --branch-coverage 50
+          --function-coverage 0
+          --log-template "coverage-lines-complete"
+          --log-template "coverage-files-complete"
+          --log-template "totals-complete"
+          --log-template "errors"
           --
           || { printf "\nDiff code coverage check failed. To view coverage report, run 'mvn clean test jacoco:report' and open 'target/site/jacoco/index.html'\n" && false; }
           fi

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

@@ -33,6 +33,7 @@
 import org.apache.druid.query.filter.BoundDimFilter;
 import org.apache.druid.query.ordering.StringComparators;
 import org.apache.druid.segment.column.BitmapIndex;
+import org.apache.druid.segment.column.ColumnCapabilities;
 import org.apache.druid.segment.data.BitmapSerdeFactory;
 import org.apache.druid.segment.data.CloseableIndexed;
 import org.apache.druid.segment.data.GenericIndexed;
@@ -195,7 +196,7 @@ public CloseableIndexed<String> getDimensionValues(String dimension)
       }
 
       @Override
-      public boolean hasMultipleValues(final String dimension)
+      public ColumnCapabilities.Capable hasMultipleValues(final String dimension)
       {
         throw new UnsupportedOperationException();
       }

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

@@ -35,6 +35,7 @@
 import org.apache.druid.query.filter.DruidLongPredicate;
 import org.apache.druid.query.filter.DruidPredicateFactory;
 import org.apache.druid.segment.column.BitmapIndex;
+import org.apache.druid.segment.column.ColumnCapabilities;
 import org.apache.druid.segment.data.BitmapSerdeFactory;
 import org.apache.druid.segment.data.CloseableIndexed;
 import org.apache.druid.segment.data.GenericIndexed;
@@ -166,7 +167,7 @@ public CloseableIndexed<String> getDimensionValues(String dimension)
       }
 
       @Override
-      public boolean hasMultipleValues(final String dimension)
+      public ColumnCapabilities.Capable hasMultipleValues(final String dimension)
       {
         throw new UnsupportedOperationException();
       }

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

@@ -21,8 +21,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import org.apache.druid.benchmark.datagen.BenchmarkColumnSchema;
-import org.apache.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import org.apache.druid.benchmark.datagen.SegmentGenerator;
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.Intervals;
@@ -42,6 +40,8 @@
 import org.apache.druid.segment.QueryableIndexStorageAdapter;
 import org.apache.druid.segment.VirtualColumns;
 import org.apache.druid.segment.column.ValueType;
+import org.apache.druid.segment.generator.GeneratorColumnSchema;
+import org.apache.druid.segment.generator.GeneratorSchemaInfo;
 import org.apache.druid.timeline.DataSegment;
 import org.apache.druid.timeline.partition.LinearShardSpec;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -90,10 +90,10 @@ public void setup()
   {
     this.closer = Closer.create();
 
-    final BenchmarkSchemaInfo schemaInfo = new BenchmarkSchemaInfo(
+    final GeneratorSchemaInfo schemaInfo = new GeneratorSchemaInfo(
         ImmutableList.of(
-            BenchmarkColumnSchema.makeNormal("x", ValueType.FLOAT, false, 1, 0d, 0d, 10000d, false),
-            BenchmarkColumnSchema.makeNormal("y", ValueType.FLOAT, false, 1, 0d, 0d, 10000d, false)
+            GeneratorColumnSchema.makeNormal("x", ValueType.FLOAT, false, 1, 0d, 0d, 10000d, false),
+            GeneratorColumnSchema.makeNormal("y", ValueType.FLOAT, false, 1, 0d, 0d, 10000d, false)
         ),
         ImmutableList.of(),
         Intervals.of("2000/P1D"),

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

@@ -20,8 +20,6 @@
 package org.apache.druid.benchmark;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.druid.benchmark.datagen.BenchmarkColumnSchema;
-import org.apache.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import org.apache.druid.benchmark.datagen.SegmentGenerator;
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.Intervals;
@@ -39,6 +37,8 @@
 import org.apache.druid.segment.QueryableIndexStorageAdapter;
 import org.apache.druid.segment.VirtualColumns;
 import org.apache.druid.segment.column.ValueType;
+import org.apache.druid.segment.generator.GeneratorColumnSchema;
+import org.apache.druid.segment.generator.GeneratorSchemaInfo;
 import org.apache.druid.timeline.DataSegment;
 import org.apache.druid.timeline.partition.LinearShardSpec;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -86,9 +86,9 @@ public void setup()
   {
     this.closer = Closer.create();
 
-    final BenchmarkSchemaInfo schemaInfo = new BenchmarkSchemaInfo(
+    final GeneratorSchemaInfo schemaInfo = new GeneratorSchemaInfo(
         ImmutableList.of(
-            BenchmarkColumnSchema.makeEnumerated(
+            GeneratorColumnSchema.makeEnumerated(
                 "x",
                 ValueType.STRING,
                 false,
@@ -97,7 +97,7 @@ public void setup()
                 Arrays.asList("Apple", "Orange", "Xylophone", "Corundum", null),
                 Arrays.asList(0.2, 0.25, 0.15, 0.10, 0.3)
             ),
-            BenchmarkColumnSchema.makeEnumerated(
+            GeneratorColumnSchema.makeEnumerated(
                 "y",
                 ValueType.STRING,
                 false,

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

@@ -20,8 +20,6 @@
 package org.apache.druid.benchmark;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.druid.benchmark.datagen.BenchmarkColumnSchema;
-import org.apache.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import org.apache.druid.benchmark.datagen.SegmentGenerator;
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.Intervals;
@@ -41,6 +39,8 @@
 import org.apache.druid.segment.VirtualColumns;
 import org.apache.druid.segment.column.ColumnHolder;
 import org.apache.druid.segment.column.ValueType;
+import org.apache.druid.segment.generator.GeneratorColumnSchema;
+import org.apache.druid.segment.generator.GeneratorSchemaInfo;
 import org.apache.druid.segment.virtual.ExpressionVirtualColumn;
 import org.apache.druid.timeline.DataSegment;
 import org.apache.druid.timeline.partition.LinearShardSpec;
@@ -86,9 +86,9 @@ public void setup()
   {
     this.closer = Closer.create();
 
-    final BenchmarkSchemaInfo schemaInfo = new BenchmarkSchemaInfo(
+    final GeneratorSchemaInfo schemaInfo = new GeneratorSchemaInfo(
         ImmutableList.of(
-            BenchmarkColumnSchema.makeZipf(
+            GeneratorColumnSchema.makeZipf(
                 "n",
                 ValueType.LONG,
                 false,
@@ -98,7 +98,7 @@ public void setup()
                 10000,
                 3d
             ),
-            BenchmarkColumnSchema.makeZipf(
+            GeneratorColumnSchema.makeZipf(
                 "s",
                 ValueType.STRING,
                 false,

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

@@ -22,9 +22,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
-import org.apache.druid.benchmark.datagen.BenchmarkDataGenerator;
-import org.apache.druid.benchmark.datagen.BenchmarkSchemaInfo;
-import org.apache.druid.benchmark.datagen.BenchmarkSchemas;
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.data.input.InputRow;
 import org.apache.druid.jackson.DefaultObjectMapper;
@@ -69,6 +66,9 @@
 import org.apache.druid.segment.filter.Filters;
 import org.apache.druid.segment.filter.OrFilter;
 import org.apache.druid.segment.filter.SelectorFilter;
+import org.apache.druid.segment.generator.DataGenerator;
+import org.apache.druid.segment.generator.GeneratorBasicSchemas;
+import org.apache.druid.segment.generator.GeneratorSchemaInfo;
 import org.apache.druid.segment.incremental.IncrementalIndex;
 import org.apache.druid.segment.serde.ComplexMetrics;
 import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory;
@@ -125,7 +125,7 @@ public class FilterPartitionBenchmark
   private Filter timeFilterHalf;
   private Filter timeFilterAll;
 
-  private BenchmarkSchemaInfo schemaInfo;
+  private GeneratorSchemaInfo schemaInfo;
 
   private static String JS_FN = "function(str) { return 'super-' + str; }";
   private static ExtractionFn JS_EXTRACTION_FN = new JavaScriptExtractionFn(JS_FN, false, JavaScriptConfig.getEnabledInstance());
@@ -153,9 +153,9 @@ public void setup() throws IOException
 
     ComplexMetrics.registerSerde("hyperUnique", new HyperUniquesSerde());
 
-    schemaInfo = BenchmarkSchemas.SCHEMA_MAP.get(schema);
+    schemaInfo = GeneratorBasicSchemas.SCHEMA_MAP.get(schema);
 
-    BenchmarkDataGenerator gen = new BenchmarkDataGenerator(
+    DataGenerator gen = new DataGenerator(
         schemaInfo.getColumnSchemas(),
         RNG_SEED,
         schemaInfo.getDataInterval(),

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

@@ -21,9 +21,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
-import org.apache.druid.benchmark.datagen.BenchmarkDataGenerator;
-import org.apache.druid.benchmark.datagen.BenchmarkSchemaInfo;
-import org.apache.druid.benchmark.datagen.BenchmarkSchemas;
 import org.apache.druid.benchmark.query.QueryBenchmarkUtil;
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.data.input.InputRow;
@@ -67,6 +64,9 @@
 import org.apache.druid.segment.QueryableIndex;
 import org.apache.druid.segment.QueryableIndexSegment;
 import org.apache.druid.segment.column.ColumnConfig;
+import org.apache.druid.segment.generator.DataGenerator;
+import org.apache.druid.segment.generator.GeneratorBasicSchemas;
+import org.apache.druid.segment.generator.GeneratorSchemaInfo;
 import org.apache.druid.segment.incremental.IncrementalIndex;
 import org.apache.druid.segment.serde.ComplexMetrics;
 import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory;
@@ -125,7 +125,7 @@ public class FilteredAggregatorBenchmark
   private DimFilter filter;
   private List<InputRow> inputRows;
   private QueryRunnerFactory factory;
-  private BenchmarkSchemaInfo schemaInfo;
+  private GeneratorSchemaInfo schemaInfo;
   private TimeseriesQuery query;
   private File tmpDir;
 
@@ -152,9 +152,9 @@ public void setup() throws IOException
 
     ComplexMetrics.registerSerde("hyperUnique", new HyperUniquesSerde());
 
-    schemaInfo = BenchmarkSchemas.SCHEMA_MAP.get(schema);
+    schemaInfo = GeneratorBasicSchemas.SCHEMA_MAP.get(schema);
 
-    BenchmarkDataGenerator gen = new BenchmarkDataGenerator(
+    DataGenerator gen = new DataGenerator(
         schemaInfo.getColumnSchemas(),
         RNG_SEED,
         schemaInfo.getDataInterval(),
@@ -202,7 +202,7 @@ public void setup() throws IOException
         QueryBenchmarkUtil.NOOP_QUERYWATCHER
     );
 
-    BenchmarkSchemaInfo basicSchema = BenchmarkSchemas.SCHEMA_MAP.get("basic");
+    GeneratorSchemaInfo basicSchema = GeneratorBasicSchemas.SCHEMA_MAP.get("basic");
     QuerySegmentSpec intervalSpec = new MultipleIntervalSegmentSpec(Collections.singletonList(basicSchema.getDataInterval()));
     List<AggregatorFactory> queryAggs = new ArrayList<>();
     queryAggs.add(filteredMetrics[0]);

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

@@ -20,14 +20,14 @@
 package org.apache.druid.benchmark;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.druid.benchmark.datagen.BenchmarkColumnSchema;
-import org.apache.druid.benchmark.datagen.BenchmarkColumnValueGenerator;
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.logger.Logger;
 import org.apache.druid.segment.column.ValueType;
 import org.apache.druid.segment.data.ColumnarFloatsSerializer;
 import org.apache.druid.segment.data.CompressionFactory;
 import org.apache.druid.segment.data.CompressionStrategy;
+import org.apache.druid.segment.generator.ColumnValueGenerator;
+import org.apache.druid.segment.generator.GeneratorColumnSchema;
 import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMedium;
 
 import java.io.BufferedReader;
@@ -65,7 +65,7 @@ public static void main(String[] args) throws IOException
       dirPath = args[0];
     }
 
-    BenchmarkColumnSchema enumeratedSchema = BenchmarkColumnSchema.makeEnumerated(
+    GeneratorColumnSchema enumeratedSchema = GeneratorColumnSchema.makeEnumerated(
         "",
         ValueType.FLOAT,
         true,
@@ -86,7 +86,7 @@ public static void main(String[] args) throws IOException
             0.0001
         )
     );
-    BenchmarkColumnSchema zipfLowSchema = BenchmarkColumnSchema.makeZipf(
+    GeneratorColumnSchema zipfLowSchema = GeneratorColumnSchema.makeZipf(
         "",
         ValueType.FLOAT,
         true,
@@ -96,7 +96,7 @@ public static void main(String[] args) throws IOException
         1000,
         1d
     );
-    BenchmarkColumnSchema zipfHighSchema = BenchmarkColumnSchema.makeZipf(
+    GeneratorColumnSchema zipfHighSchema = GeneratorColumnSchema.makeZipf(
         "",
         ValueType.FLOAT,
         true,
@@ -106,7 +106,7 @@ public static void main(String[] args) throws IOException
         1000,
         3d
     );
-    BenchmarkColumnSchema sequentialSchema = BenchmarkColumnSchema.makeSequential(
+    GeneratorColumnSchema sequentialSchema = GeneratorColumnSchema.makeSequential(
         "",
         ValueType.FLOAT,
         true,
@@ -115,7 +115,7 @@ public static void main(String[] args) throws IOException
         1470187671,
         2000000000
     );
-    BenchmarkColumnSchema uniformSchema = BenchmarkColumnSchema.makeContinuousUniform(
+    GeneratorColumnSchema uniformSchema = GeneratorColumnSchema.makeContinuousUniform(
         "",
         ValueType.FLOAT,
         true,
@@ -125,18 +125,18 @@ public static void main(String[] args) throws IOException
         1000
     );
 
-    Map<String, BenchmarkColumnValueGenerator> generators = new HashMap<>();
-    generators.put("enumerate", new BenchmarkColumnValueGenerator(enumeratedSchema, 1));
-    generators.put("zipfLow", new BenchmarkColumnValueGenerator(zipfLowSchema, 1));
-    generators.put("zipfHigh", new BenchmarkColumnValueGenerator(zipfHighSchema, 1));
-    generators.put("sequential", new BenchmarkColumnValueGenerator(sequentialSchema, 1));
-    generators.put("uniform", new BenchmarkColumnValueGenerator(uniformSchema, 1));
+    Map<String, ColumnValueGenerator> generators = new HashMap<>();
+    generators.put("enumerate", new ColumnValueGenerator(enumeratedSchema, 1));
+    generators.put("zipfLow", new ColumnValueGenerator(zipfLowSchema, 1));
+    generators.put("zipfHigh", new ColumnValueGenerator(zipfHighSchema, 1));
+    generators.put("sequential", new ColumnValueGenerator(sequentialSchema, 1));
+    generators.put("uniform", new ColumnValueGenerator(uniformSchema, 1));
 
     File dir = new File(dirPath);
     dir.mkdir();
 
     // create data files using BenchmarkColunValueGenerator
-    for (Map.Entry<String, BenchmarkColumnValueGenerator> entry : generators.entrySet()) {
+    for (Map.Entry<String, ColumnValueGenerator> entry : generators.entrySet()) {
       final File dataFile = new File(dir, entry.getKey());
       dataFile.delete();
       try (Writer writer = Files.newBufferedWriter(dataFile.toPath(), StandardCharsets.UTF_8)) {
@@ -147,7 +147,7 @@ public static void main(String[] args) throws IOException
     }
 
     // create compressed files using all combinations of CompressionStrategy and FloatEncoding provided
-    for (Map.Entry<String, BenchmarkColumnValueGenerator> entry : generators.entrySet()) {
+    for (Map.Entry<String, ColumnValueGenerator> entry : generators.entrySet()) {
       for (CompressionStrategy compression : COMPRESSIONS) {
         String name = entry.getKey() + "-" + compression;
         log.info("%s: ", name);