From a325239147a0328f3328fc353c4b99884c06860f Mon Sep 17 00:00:00 2001 From: Suneet Saldanha Date: Fri, 13 Dec 2019 14:00:17 -0800 Subject: [PATCH 1/3] Fix equalsAndHashCode in ClientCompactQueryTuningConfig This change introduces a dependency to EqualsVerifier for the test scope. The dependency is licensed under Apache 2. The library makes it trivial to add equals and hashCode checks to prevent bugs like this from happening in the future --- pom.xml | 6 ++++++ server/pom.xml | 5 +++++ .../indexing/ClientCompactQueryTuningConfig.java | 3 +++ .../ClientCompactQueryTuningConfigTest.java | 13 +++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 server/src/test/java/org/apache/druid/indexing/ClientCompactQueryTuningConfigTest.java diff --git a/pom.xml b/pom.xml index c4f47c6c8992..ae22bdcddaa6 100644 --- a/pom.xml +++ b/pom.xml @@ -1198,6 +1198,12 @@ ${guava.version} test + + nl.jqno.equalsverifier + equalsverifier + 3.1.10 + test + com.github.stefanbirkner system-rules diff --git a/server/pom.xml b/server/pom.xml index e4850fb55273..d3f902dd481b 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -421,6 +421,11 @@ assertj-core test + + nl.jqno.equalsverifier + equalsverifier + test + diff --git a/server/src/main/java/org/apache/druid/client/indexing/ClientCompactQueryTuningConfig.java b/server/src/main/java/org/apache/druid/client/indexing/ClientCompactQueryTuningConfig.java index c99a7cb0bf49..026c6a746afc 100644 --- a/server/src/main/java/org/apache/druid/client/indexing/ClientCompactQueryTuningConfig.java +++ b/server/src/main/java/org/apache/druid/client/indexing/ClientCompactQueryTuningConfig.java @@ -193,6 +193,7 @@ public boolean equals(Object o) Objects.equals(maxBytesInMemory, that.maxBytesInMemory) && Objects.equals(maxRowsInMemory, that.maxRowsInMemory) && Objects.equals(maxTotalRows, that.maxTotalRows) && + Objects.equals(splitHintSpec, that.splitHintSpec) && Objects.equals(indexSpec, that.indexSpec) && Objects.equals(maxPendingPersists, that.maxPendingPersists) && Objects.equals(pushTimeout, that.pushTimeout) && @@ -207,6 +208,7 @@ public int hashCode() maxBytesInMemory, maxRowsInMemory, maxTotalRows, + splitHintSpec, indexSpec, maxPendingPersists, pushTimeout, @@ -222,6 +224,7 @@ public String toString() ", maxBytesInMemory=" + maxBytesInMemory + ", maxRowsInMemory=" + maxRowsInMemory + ", maxTotalRows=" + maxTotalRows + + ", splitHintSpec=" + splitHintSpec + ", indexSpec=" + indexSpec + ", maxPendingPersists=" + maxPendingPersists + ", pushTimeout=" + pushTimeout + diff --git a/server/src/test/java/org/apache/druid/indexing/ClientCompactQueryTuningConfigTest.java b/server/src/test/java/org/apache/druid/indexing/ClientCompactQueryTuningConfigTest.java new file mode 100644 index 000000000000..cf32760bfc54 --- /dev/null +++ b/server/src/test/java/org/apache/druid/indexing/ClientCompactQueryTuningConfigTest.java @@ -0,0 +1,13 @@ +package org.apache.druid.indexing; + +import nl.jqno.equalsverifier.EqualsVerifier; +import org.apache.druid.client.indexing.ClientCompactQueryTuningConfig; +import org.junit.Test; + +public class ClientCompactQueryTuningConfigTest { + @Test + public void test_equalsContract() { + // If this test failed, make sure to validate that toString was also updated correctly! + EqualsVerifier.forClass(ClientCompactQueryTuningConfig.class).usingGetClass().verify(); + } +} From 5c46a7748eae4629de4e796daaa7bea4ce34b85f Mon Sep 17 00:00:00 2001 From: Suneet Saldanha Date: Mon, 16 Dec 2019 09:52:55 -0800 Subject: [PATCH 2/3] fix checkstyle --- .../ClientCompactQueryTuningConfigTest.java | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/server/src/test/java/org/apache/druid/indexing/ClientCompactQueryTuningConfigTest.java b/server/src/test/java/org/apache/druid/indexing/ClientCompactQueryTuningConfigTest.java index cf32760bfc54..b08e3fe50009 100644 --- a/server/src/test/java/org/apache/druid/indexing/ClientCompactQueryTuningConfigTest.java +++ b/server/src/test/java/org/apache/druid/indexing/ClientCompactQueryTuningConfigTest.java @@ -1,13 +1,34 @@ +/* + * 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.indexing; import nl.jqno.equalsverifier.EqualsVerifier; import org.apache.druid.client.indexing.ClientCompactQueryTuningConfig; import org.junit.Test; -public class ClientCompactQueryTuningConfigTest { - @Test - public void test_equalsContract() { - // If this test failed, make sure to validate that toString was also updated correctly! - EqualsVerifier.forClass(ClientCompactQueryTuningConfig.class).usingGetClass().verify(); - } +public class ClientCompactQueryTuningConfigTest +{ + @Test + public void test_equalsContract() + { + // If this test failed, make sure to validate that toString was also updated correctly! + EqualsVerifier.forClass(ClientCompactQueryTuningConfig.class).usingGetClass().verify(); + } } From e81703fdbaa2507d95a940d63db7e4aaa2341d57 Mon Sep 17 00:00:00 2001 From: Suneet Saldanha Date: Mon, 16 Dec 2019 11:56:24 -0800 Subject: [PATCH 3/3] fix test name --- .../druid/indexing/ClientCompactQueryTuningConfigTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/test/java/org/apache/druid/indexing/ClientCompactQueryTuningConfigTest.java b/server/src/test/java/org/apache/druid/indexing/ClientCompactQueryTuningConfigTest.java index b08e3fe50009..eb7f42c7eb90 100644 --- a/server/src/test/java/org/apache/druid/indexing/ClientCompactQueryTuningConfigTest.java +++ b/server/src/test/java/org/apache/druid/indexing/ClientCompactQueryTuningConfigTest.java @@ -26,7 +26,7 @@ public class ClientCompactQueryTuningConfigTest { @Test - public void test_equalsContract() + public void testEqualsContract() { // If this test failed, make sure to validate that toString was also updated correctly! EqualsVerifier.forClass(ClientCompactQueryTuningConfig.class).usingGetClass().verify();