Skip to content

Issue 935: Issue 915: Part 3 - Make circe-checksum module work for both java 8 and java 9 #937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sijie wants to merge 6 commits into from
Closed

Issue 935: Issue 915: Part 3 - Make circe-checksum module work for both java 8 and java 9 #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ddfd36
Copy `pulsar-checksum` module as `bookkeeper-checksum` module
sijie Dec 14, 2017
9b5a788
- rename bookkeeper-checksum to circe-checksum
sijie Dec 22, 2017
3ed7c87
Add crc32c integer/long checksum utils under `com.scurrilous.circe.ch…
sijie Dec 23, 2017
73049f8
Issue 935: Issue 915: Part 3 - Make circe-checksum module work for bo…
sijie Jan 3, 2018
6a13a30
Exclude netty-common from bookkeeper-common and netty-buffer from cir…
sijie Jan 5, 2018
6f8eca3
Merge remote-tracking branch 'apache/master' into fix_pulsar_checksum
sijie Jan 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 53 additions & 37 deletions bookkeeper-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper-common</artifactId>
<version>${project.parent.version}</version>
<exclusions>
<!-- exclude "netty-common" since "netty-all" already introduces it -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
Expand Down Expand Up @@ -70,35 +77,37 @@
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
<type>test-jar</type>
<scope>test</scope>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>${netty-boringssl.version}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper.http</groupId>
<artifactId>http-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>circe-checksum</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<!-- exclude "netty-buffer" since "netty-all" already introduces it -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<artifactId>netty-buffer</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down Expand Up @@ -161,31 +170,37 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty.version}</version>
</dependency>
<!-- testing dependencies -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minikdc</artifactId>
<version>2.7.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>${netty-boringssl.version}</version>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper.http</groupId>
<artifactId>http-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-checksum</artifactId>
<version>1.20.0-incubating</version>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
<type>test-jar</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
Expand Down Expand Up @@ -224,6 +239,7 @@
<include>com.google.protobuf:protobuf-java</include>
<include>org.apache.bookkeeper:bookkeeper-common</include>
<include>org.apache.bookkeeper:bookkeeper-proto</include>
<include>org.apache.bookkeeper:circe-checksum</include>
<include>org.apache.bookkeeper.stats:bookkeeper-stats-api</include>
</includes>
</artifactSet>
Expand Down
6 changes: 3 additions & 3 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/client/CRC32CDigestManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
* limitations under the License.
*/

import com.scurrilous.circe.checksum.Crc32cIntChecksum;
import com.scurrilous.circe.crc.Sse42Crc32C;
import io.netty.buffer.ByteBuf;
import org.apache.commons.lang3.mutable.MutableBoolean;
import org.apache.commons.lang3.mutable.MutableInt;
import org.apache.pulsar.checksum.utils.Crc32cChecksum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -56,10 +56,10 @@ void populateValueAndReset(ByteBuf buf) {
void update(ByteBuf data) {
if (isNewCrc.get().isTrue()) {
isNewCrc.get().setFalse();
currentCrc.get().setValue(Crc32cChecksum.computeChecksum(data));
currentCrc.get().setValue(Crc32cIntChecksum.computeChecksum(data));
} else {
final int lastCrc = currentCrc.get().intValue();
currentCrc.get().setValue(Crc32cChecksum.resumeChecksum(lastCrc, data));
currentCrc.get().setValue(Crc32cIntChecksum.resumeChecksum(lastCrc, data));
}
}
}
30 changes: 16 additions & 14 deletions circe-checksum/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,6 @@
<version>${netty.version}</version>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.5</version>
</dependency>

<dependency>
<groupId>com.googlecode.jmockit</groupId>
<artifactId>jmockit</artifactId>
<version>1.7</version>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand Down Expand Up @@ -105,7 +92,22 @@
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<compilerArgs>
<!-- Object.finalize() is deprecated at java 9 -->
<!-- <compilerArg>-Werror</compilerArg> -->
<compilerArg>-Xlint:deprecation</compilerArg>
<compilerArg>-Xlint:unchecked</compilerArg>
<!-- https://issues.apache.org/jira/browse/MCOMPILER-205 -->
<compilerArg>-Xpkginfo:always</compilerArg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>com.github.maven-nar</groupId>
<artifactId>nar-maven-plugin</artifactId>
Expand Down
5 changes: 2 additions & 3 deletions circe-checksum/src/test/java/com/scurrilous/circe/CommonHashesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@
******************************************************************************/
package com.scurrilous.circe;

import static org.testng.Assert.assertEquals;
import static org.junit.Assert.assertEquals;

import java.nio.charset.Charset;

import org.testng.annotations.Test;
import org.junit.Test;

@SuppressWarnings("javadoc")
public class CommonHashesTest {
Expand Down
4 changes: 2 additions & 2 deletions circe-checksum/src/test/java/com/scurrilous/circe/checksum/ChecksumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
package com.scurrilous.circe.checksum;

import static com.scurrilous.circe.params.CrcParameters.CRC32C;
import static org.testng.Assert.assertEquals;
import static org.junit.Assert.assertEquals;

import com.scurrilous.circe.IncrementalIntHash;
import com.scurrilous.circe.IncrementalLongHash;
import com.scurrilous.circe.crc.StandardCrcProvider;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import org.testng.annotations.Test;
import org.junit.Test;

/**
* Verify circe checksum.
Expand Down
9 changes: 4 additions & 5 deletions circe-checksum/src/test/java/com/scurrilous/circe/crc/CRCProvidersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,20 @@
import static com.scurrilous.circe.HashSupport.STATELESS_INCREMENTAL;
import static com.scurrilous.circe.params.CrcParameters.CRC32;
import static com.scurrilous.circe.params.CrcParameters.CRC64;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import java.util.EnumSet;
import java.util.Iterator;
import java.util.Map.Entry;
import java.util.SortedMap;

import org.testng.annotations.Test;

import com.scurrilous.circe.HashProvider;
import com.scurrilous.circe.HashProviders;
import com.scurrilous.circe.HashSupport;
import com.scurrilous.circe.IncrementalLongHash;
import org.junit.Test;

@SuppressWarnings("javadoc")
public class CRCProvidersTest {
Expand Down
8 changes: 3 additions & 5 deletions circe-checksum/src/test/java/com/scurrilous/circe/crc/CRCTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,14 @@
import static com.scurrilous.circe.params.CrcParameters.CRC32_POSIX;
import static com.scurrilous.circe.params.CrcParameters.CRC64;
import static com.scurrilous.circe.params.CrcParameters.CRC64_XZ;
import static org.testng.Assert.assertEquals;
import static org.junit.Assert.assertEquals;

import com.scurrilous.circe.IncrementalLongHash;
import java.nio.charset.Charset;

import org.testng.annotations.Test;

import com.scurrilous.circe.HashProvider;
import com.scurrilous.circe.IncrementalIntHash;
import com.scurrilous.circe.params.CrcParameters;
import java.nio.charset.Charset;
import org.junit.Test;

/**
* Tests the {@link StandardCrcProvider} with various CRC algorithms. See the <a
Expand Down
Loading