clintropolis commented on a change in pull request #10171:
URL: https://github.com/apache/druid/pull/10171#discussion_r454195864
##########
File path:
processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryQueryToolChest.java
##########
@@ -138,7 +139,9 @@ public
TimeseriesQueryQueryToolChest(TimeseriesQueryMetricsFactory queryMetricsF
final Sequence<Result<TimeseriesResultValue>> finalSequence;
- if (query.getGranularity().equals(Granularities.ALL) &&
!query.isSkipEmptyBuckets()) {
+ if (query.getGranularity().equals(Granularities.ALL) &&
Review comment:
what is this change for?
##########
File path: integration-tests/stop_cluster.sh
##########
@@ -20,7 +20,7 @@ if [ -n "$DRUID_INTEGRATION_TEST_SKIP_RUN_DOCKER" ] && [
"$DRUID_INTEGRATION_TES
exit 0
fi
-for node in druid-historical druid-coordinator druid-overlord druid-router
druid-router-permissive-tls druid-router-no-client-auth-tls
druid-router-custom-check-tls druid-broker druid-middlemanager
druid-zookeeper-kafka druid-metadata-storage druid-it-hadoop;
+for node in druid-historical druid-historical-for-query-retry-test
druid-coordinator druid-overlord druid-router druid-router-permissive-tls
druid-router-no-client-auth-tls druid-router-custom-check-tls druid-broker
druid-middlemanager druid-zookeeper-kafka druid-metadata-storage
druid-it-hadoop;
Review comment:
I don't think this is necessary in this PR, but I think we should
consider moving this cluster stop script to using docker compose to tear down
the thing that it previously created
##########
File path: integration-tests/docker/docker-compose.base.yml
##########
@@ -142,12 +142,30 @@ services:
- ./environment-configs/common
- ./environment-configs/historical
+ druid-historical-for-query-retry-test:
Review comment:
doesn't need to be changed in this PR, but is this useful to include in
the base compose file? I guess all the funny routers are here too, so not a big
deal, but we might want to consider moving these definitions into the compose
files that actually use them
##########
File path:
integration-tests/src/main/java/org/apache/druid/cli/MainForQueryRetryTest.java
##########
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.cli;
+
+import com.google.inject.Injector;
+import io.airlift.airline.Cli;
+import io.airlift.airline.Help;
+import io.airlift.airline.ParseException;
+import io.netty.util.SuppressForbidden;
+import org.apache.druid.guice.ExtensionsConfig;
+import org.apache.druid.guice.GuiceInjectors;
+import org.apache.druid.initialization.Initialization;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.ServiceLoader;
+
+/**
+ * Main class for query retry testing.
+ *
+ * @see CliHistoricalForQueryRetryTest
+ */
+public class MainForQueryRetryTest
Review comment:
Is a custom main method easier than using the`CliCommandCreator`
extension point? I thought you just need something like this:
```java
public class QueryRetryTestCommandCreator implements CliCommandCreator
{
@Override
public void addCommands(Cli.CliBuilder builder)
{
builder.withGroup("server").withCommands(CliHistoricalForQueryRetryTest.class);
}
}
```
and a META-INF/services entry for it, but I can't remember, maybe there is
something more to it
##########
File path: .travis.yml
##########
@@ -397,7 +405,7 @@ jobs:
name: "(Compile=openjdk8, Run=openjdk8) other integration test"
jdk: openjdk8
services: *integration_test_services
- env:
TESTNG_GROUPS='-DexcludedGroups=batch-index,input-format,perfect-rollup-parallel-batch-index,kafka-index,query,realtime-index,security,s3-deep-storage,gcs-deep-storage,azure-deep-storage,hdfs-deep-storage,s3-ingestion,kinesis-index,kinesis-data-format,kafka-transactional-index,kafka-index-slow,kafka-transactional-index-slow,kafka-data-format,hadoop-s3-to-s3-deep-storage,hadoop-s3-to-hdfs-deep-storage,hadoop-azure-to-azure-deep-storage,hadoop-azure-to-hdfs-deep-storage,hadoop-gcs-to-gcs-deep-storage,hadoop-gcs-to-hdfs-deep-storage,aliyun-oss-deep-storage'
JVM_RUNTIME='-Djvm.runtime=11'
+ env:
TESTNG_GROUPS='-DexcludedGroups=batch-index,input-format,perfect-rollup-parallel-batch-index,kafka-index,query,query-retry,realtime-index,security,s3-deep-storage,gcs-deep-storage,azure-deep-storage,hdfs-deep-storage,s3-ingestion,kinesis-index,kinesis-data-format,kafka-transactional-index,kafka-index-slow,kafka-transactional-index-slow,kafka-data-format,hadoop-s3-to-s3-deep-storage,hadoop-s3-to-hdfs-deep-storage,hadoop-azure-to-azure-deep-storage,hadoop-azure-to-hdfs-deep-storage,hadoop-gcs-to-gcs-deep-storage,hadoop-gcs-to-hdfs-deep-storage,aliyun-oss-deep-storage'
JVM_RUNTIME='-Djvm.runtime=11'
Review comment:
heh, this list is getting kind of long 😅
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
