Browse Source
I've added a new class with an incrementing atomic long to represent the verification guard. Upon creation of verification guard, we will increment this value and assign it to the guard. The expected behavior is the same as the object guard, but with better debuggability with the string value and type safety (I found a type safety issue in the current code when implementing this) Reviewers: Ismael Juma <ismael@juma.me.uk>, Artem Livshits <alivshits@confluent.io>pull/13762/merge
Justine Olshan
11 months ago
committed by
GitHub
10 changed files with 196 additions and 75 deletions
@ -0,0 +1,53 @@
@@ -0,0 +1,53 @@
|
||||
/** |
||||
* 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 unit.kafka.log |
||||
|
||||
import org.apache.kafka.storage.internals.log.VerificationGuard |
||||
import org.apache.kafka.storage.internals.log.VerificationGuard.SENTINEL |
||||
import org.junit.jupiter.api.Assertions.{assertEquals, assertFalse, assertNotEquals, assertTrue} |
||||
import org.junit.jupiter.api.Test |
||||
|
||||
class VerificationGuardTest { |
||||
|
||||
@Test |
||||
def testEqualsAndHashCode(): Unit = { |
||||
val verificationGuard1 = new VerificationGuard |
||||
val verificationGuard2 = new VerificationGuard |
||||
|
||||
assertNotEquals(verificationGuard1, verificationGuard2) |
||||
assertNotEquals(SENTINEL, verificationGuard1) |
||||
assertEquals(SENTINEL, SENTINEL) |
||||
|
||||
assertNotEquals(verificationGuard1.hashCode, verificationGuard2.hashCode) |
||||
assertNotEquals(SENTINEL.hashCode, verificationGuard1.hashCode) |
||||
assertEquals(SENTINEL.hashCode, SENTINEL.hashCode) |
||||
} |
||||
|
||||
@Test |
||||
def testVerify(): Unit = { |
||||
val verificationGuard1 = new VerificationGuard |
||||
val verificationGuard2 = new VerificationGuard |
||||
|
||||
assertFalse(verificationGuard1.verify(verificationGuard2)) |
||||
assertFalse(verificationGuard1.verify(SENTINEL)) |
||||
assertFalse(SENTINEL.verify(verificationGuard1)) |
||||
assertFalse(SENTINEL.verify(SENTINEL)) |
||||
assertTrue(verificationGuard1.verify(verificationGuard1)) |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,62 @@
@@ -0,0 +1,62 @@
|
||||
/* |
||||
* 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.kafka.storage.internals.log; |
||||
|
||||
import java.util.concurrent.atomic.AtomicLong; |
||||
|
||||
public final class VerificationGuard { |
||||
|
||||
// The sentinel VerificationGuard will be used as a default when no verification guard is provided.
|
||||
// It can not be used to verify a transaction is ongoing and its value is always 0.
|
||||
public static final VerificationGuard SENTINEL = new VerificationGuard(0); |
||||
private static final AtomicLong INCREMENTING_ID = new AtomicLong(0L); |
||||
private final long value; |
||||
|
||||
public VerificationGuard() { |
||||
value = INCREMENTING_ID.incrementAndGet(); |
||||
} |
||||
|
||||
private VerificationGuard(long value) { |
||||
this.value = value; |
||||
} |
||||
|
||||
@Override |
||||
public String toString() { |
||||
return "VerificationGuard(value=" + value + ")"; |
||||
} |
||||
|
||||
@Override |
||||
public boolean equals(Object obj) { |
||||
if ((null == obj) || (obj.getClass() != this.getClass())) |
||||
return false; |
||||
VerificationGuard guard = (VerificationGuard) obj; |
||||
return value == guard.value(); |
||||
} |
||||
|
||||
@Override |
||||
public int hashCode() { |
||||
return Long.hashCode(value); |
||||
} |
||||
|
||||
private long value() { |
||||
return value; |
||||
} |
||||
|
||||
public boolean verify(VerificationGuard verifyingGuard) { |
||||
return verifyingGuard != SENTINEL && verifyingGuard.equals(this); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue