This is an automated email from the ASF dual-hosted git repository.
gian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 5f3b3101153 Build reliablity fixes (#15048)
5f3b3101153 is described below
commit 5f3b3101153008408bafaf64d9c08c8a9f005b1d
Author: Zoltan Haindrich <[email protected]>
AuthorDate: Thu Sep 28 21:27:52 2023 +0200
Build reliablity fixes (#15048)
* disable parallel builds; enable batch mode to get rid of transfer progress
* restore .m2 from setup-java if not found
* some change to sql
* add ws
* fix quote
* fix quote
* undo querytest change
* nullhandling in mvtest
* init more
* skip commitid plugin
* add-back 1.0C to build ; remove redundant skip-s from copy-resources; add
comment
---
.github/workflows/standard-its.yml | 1 +
.github/workflows/unit-and-integration-tests-unified.yml | 1 +
.../query/materializedview/DatasourceOptimizerTest.java | 7 ++++++-
.../MaterializedViewQueryQueryToolChestTest.java | 7 +++++--
.../query/materializedview/MaterializedViewQueryTest.java | 5 +++++
integration-tests/script/copy_resources_template.sh | 3 ++-
it.sh | 12 ++++++------
pom.xml | 1 +
8 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/standard-its.yml
b/.github/workflows/standard-its.yml
index f44dee04bdf..2648dc0993b 100644
--- a/.github/workflows/standard-its.yml
+++ b/.github/workflows/standard-its.yml
@@ -159,6 +159,7 @@ jobs:
with:
path: ~/.m2/repository
key: maven-${{ runner.os }}-8-${{ github.sha }}
+ restore-keys: setup-java-Linux-maven-${{ hashFiles('**/pom.xml') }}
- name: Maven build
if: steps.maven-restore.outputs.cache-hit != 'true'
diff --git a/.github/workflows/unit-and-integration-tests-unified.yml
b/.github/workflows/unit-and-integration-tests-unified.yml
index ff963dac771..6ff6c8bd650 100644
--- a/.github/workflows/unit-and-integration-tests-unified.yml
+++ b/.github/workflows/unit-and-integration-tests-unified.yml
@@ -72,6 +72,7 @@ jobs:
with:
path: ~/.m2/repository
key: maven-${{ runner.os }}-${{ matrix.jdk }}-${{ github.sha }}
+ restore-keys: setup-java-Linux-maven-${{ hashFiles('**/pom.xml') }}
- name: Cache targets
id: target
diff --git
a/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/DatasourceOptimizerTest.java
b/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/DatasourceOptimizerTest.java
index 673c2531999..80ade5c1c9c 100644
---
a/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/DatasourceOptimizerTest.java
+++
b/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/DatasourceOptimizerTest.java
@@ -34,6 +34,7 @@ import org.apache.druid.client.BrokerServerView;
import org.apache.druid.client.DruidServer;
import org.apache.druid.client.selector.HighestPriorityTierSelectorStrategy;
import org.apache.druid.client.selector.RandomServerSelectorStrategy;
+import org.apache.druid.common.config.NullHandling;
import org.apache.druid.curator.CuratorTestBase;
import org.apache.druid.indexing.materializedview.DerivativeDataSourceMetadata;
import org.apache.druid.jackson.DefaultObjectMapper;
@@ -72,6 +73,10 @@ import java.util.concurrent.TimeUnit;
public class DatasourceOptimizerTest extends CuratorTestBase
{
+ static {
+ NullHandling.initializeForTests();
+ }
+
@Rule
public final TestDerbyConnector.DerbyConnectorRule derbyConnectorRule = new
TestDerbyConnector.DerbyConnectorRule();
private DerivativeDataSourceManager derivativesManager;
@@ -142,7 +147,7 @@ public class DatasourceOptimizerTest extends CuratorTestBase
Set<String> metrics = Sets.newHashSet("cost");
DerivativeDataSourceMetadata metadata = new
DerivativeDataSourceMetadata(baseDataSource, dims, metrics);
metadataStorageCoordinator.insertDataSourceMetadata(dataSource, metadata);
- // insert base datasource segments
+ // insert base datasource segments
List<Boolean> baseResult = Lists.transform(
ImmutableList.of(
"2011-04-01/2011-04-02",
diff --git
a/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/MaterializedViewQueryQueryToolChestTest.java
b/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/MaterializedViewQueryQueryToolChestTest.java
index b96ff17f670..3b230d706bf 100644
---
a/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/MaterializedViewQueryQueryToolChestTest.java
+++
b/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/MaterializedViewQueryQueryToolChestTest.java
@@ -23,6 +23,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableMap;
+import org.apache.druid.common.config.NullHandling;
import org.apache.druid.data.input.MapBasedRow;
import org.apache.druid.jackson.DefaultObjectMapper;
import org.apache.druid.java.util.common.DateTimes;
@@ -55,6 +56,10 @@ import java.util.stream.Collectors;
public class MaterializedViewQueryQueryToolChestTest
{
+ static {
+ NullHandling.initializeForTests();
+ }
+
private static final ObjectMapper JSON_MAPPER = new DefaultObjectMapper();
@Test
@@ -244,7 +249,5 @@ public class MaterializedViewQueryQueryToolChestTest
));
Assert.assertEquals(realQuery,
materializedViewQueryQueryToolChest.getRealQuery(materializedViewQuery));
-
}
-
}
diff --git
a/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/MaterializedViewQueryTest.java
b/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/MaterializedViewQueryTest.java
index ad9913eca55..cb52e1b2a3b 100644
---
a/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/MaterializedViewQueryTest.java
+++
b/extensions-contrib/materialized-view-selection/src/test/java/org/apache/druid/query/materializedview/MaterializedViewQueryTest.java
@@ -25,6 +25,7 @@ import com.fasterxml.jackson.databind.jsontype.NamedType;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
+import org.apache.druid.common.config.NullHandling;
import org.apache.druid.java.util.common.HumanReadableBytes;
import org.apache.druid.math.expr.ExprMacroTable;
import org.apache.druid.query.Query;
@@ -45,6 +46,10 @@ import java.io.IOException;
public class MaterializedViewQueryTest
{
+ static {
+ NullHandling.initializeForTests();
+ }
+
private static final ObjectMapper JSON_MAPPER = TestHelper.makeJsonMapper();
private DataSourceOptimizer optimizer;
diff --git a/integration-tests/script/copy_resources_template.sh
b/integration-tests/script/copy_resources_template.sh
index fade47c4e31..7f1c4180247 100755
--- a/integration-tests/script/copy_resources_template.sh
+++ b/integration-tests/script/copy_resources_template.sh
@@ -30,7 +30,8 @@ cp -R docker $SHARED_DIR/docker
pushd ../
rm -rf distribution/target/apache-druid-$DRUID_VERSION-integration-test-bin
-mvn -Pskip-static-checks,skip-tests -T1C -Danimal.sniffer.skip=true
-Dcheckstyle.skip=true -Dweb.console.skip=true -Dcyclonedx.skip=true
-Denforcer.skip=true -Dforbiddenapis.skip=true -Dmaven.javadoc.skip=true
-Dpmd.skip=true -Dspotbugs.skip=true install -Pintegration-test
+# using parallel build here may not yield significant speedups
+mvn -B -Pskip-static-checks,skip-tests -Dweb.console.skip=true install
-Pintegration-test
mv distribution/target/apache-druid-$DRUID_VERSION-integration-test-bin/bin
$SHARED_DIR/docker/bin
mv distribution/target/apache-druid-$DRUID_VERSION-integration-test-bin/lib
$SHARED_DIR/docker/lib
mv
distribution/target/apache-druid-$DRUID_VERSION-integration-test-bin/extensions
$SHARED_DIR/docker/extensions
diff --git a/it.sh b/it.sh
index ce4e8e8483e..12519c24b54 100755
--- a/it.sh
+++ b/it.sh
@@ -232,17 +232,17 @@ case $CMD in
mvn -q clean install dependency:go-offline -P dist $MAVEN_IGNORE
;;
"build" )
- mvn clean install -P dist $MAVEN_IGNORE -T1.0C $*
+ mvn -B clean install -P dist $MAVEN_IGNORE -T1.0C $*
;;
"dist" )
- mvn install -P dist $MAVEN_IGNORE -pl :distribution
+ mvn -B install -P dist $MAVEN_IGNORE -pl :distribution
;;
"tools" )
- mvn install -pl :druid-it-tools
+ mvn -B install -pl :druid-it-tools
;;
"image" )
cd $DRUID_DEV/integration-tests-ex/image
- mvn install -P test-image $MAVEN_IGNORE
+ mvn -B install -P test-image $MAVEN_IGNORE
;;
"gen")
# Generate the docker-compose.yaml files. Mostly for debugging
@@ -264,7 +264,7 @@ case $CMD in
"run" )
require_category
reuse_override
- mvn $TEST_OPTIONS -P IT-$CATEGORY -pl $MAVEN_PROJECT
+ mvn -B $TEST_OPTIONS -P IT-$CATEGORY -pl $MAVEN_PROJECT
;;
"test" )
require_category
@@ -275,7 +275,7 @@ case $CMD in
# Run the test. On failure, still shut down the cluster.
# Return Maven's return code as the script's return code.
set +e
- mvn $TEST_OPTIONS -P IT-$CATEGORY -pl $MAVEN_PROJECT
+ mvn -B $TEST_OPTIONS -P IT-$CATEGORY -pl $MAVEN_PROJECT
RESULT=$?
set -e
$IT_CASES_DIR/cluster.sh down $CATEGORY
diff --git a/pom.xml b/pom.xml
index 3f2dddfb2bb..e34de8a287f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2106,6 +2106,7 @@
<maven.javadoc.skip>true</maven.javadoc.skip>
<pmd.skip>true</pmd.skip>
<spotbugs.skip>true</spotbugs.skip>
+ <maven.gitcommitid.skip>true</maven.gitcommitid.skip>
</properties>
</profile>
<profile>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
