Commit 6f47797c authored by chiaming2000's avatar chiaming2000 Committed by GitHub
Browse files

Merge pull request #40 from Kinetic/features/crc32c 

Features/crc32c
parents 38b5f23e 7dda5515

kinetic-all/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<parent>

		<groupId>com.seagate.kinetic</groupId>

		<artifactId>kinetic-java</artifactId>

		<version>0.8.0.6-SNAPSHOT</version>

		<version>3.0.7-SNAPSHOT</version>

	</parent>

	<artifactId>kinetic-all</artifactId>

	<packaging>jar</packaging>

kinetic-client/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
	<parent>

		<groupId>com.seagate.kinetic</groupId>

		<artifactId>kinetic-java</artifactId>

		<version>0.8.0.6-SNAPSHOT</version>

		<version>3.0.7-SNAPSHOT</version>

	</parent>

	<artifactId>kinetic-client</artifactId>

	<name>Kinetic/Client</name>

kinetic-client/src/main/java/com/seagate/kinetic/client/io/IoHandler.java

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import kinetic.client.KineticException; 
import com.seagate.kinetic.client.internal.ClientProxy;

import com.seagate.kinetic.client.io.provider.spi.ClientTransportProvider;

import com.seagate.kinetic.common.lib.KineticMessage;

import com.seagate.kinetic.proto.Kinetic;



/**

 *
@@ -115,6 +116,8 @@ public class IoHandler { 


            // init transport

            this.transport.init(messageHandler);

            

            logger.info("connected to device., protocol version: " + Kinetic.Local.getDefaultInstance().getProtocolVersion());

        } catch (KineticException ke) {

            close();

            throw ke;

kinetic-common/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
	<parent>

		<groupId>com.seagate.kinetic</groupId>

		<artifactId>kinetic-java</artifactId>

		<version>0.8.0.6-SNAPSHOT</version>

		<version>3.0.7-SNAPSHOT</version>

	</parent>

	<artifactId>kinetic-common</artifactId>

	<name>Kinetic/Common</name>

kinetic-common/src/main/java/com/seagate/kinetic/common/lib/MessageDigestUtil.java

+12 −6
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ public class MessageDigestUtil { 
    // CRC32 checksum instance

    private static KineticTagCalc crc32 = null;

    

    // CRC32C checksum instance

    private static KineticTagCalc crc32c = null;



    public static ByteString calculateTag(Algorithm algo, byte[] value) {



        ByteString tag = null;
@@ -69,6 +72,7 @@ public class MessageDigestUtil { 
        case SHA1:

        case SHA2:

        case CRC32:

        case CRC32C:

            return true;

        default:

            return false;
@@ -155,20 +159,20 @@ public class MessageDigestUtil { 
    public static KineticTagCalc getCrc32cInstance() {



        // check if constructed

        if (crc32 != null) {

            return crc32;

        if (crc32c != null) {

            return crc32c;

        }



        // sync

        synchronized (MessageDigestUtil.class) {



            // check if already constructed

            if (crc32 == null) {

                crc32 = new Crc32cTagCalc2();

            if (crc32c == null) {

                crc32c = new Crc32cTagCalc2();

            }

        }



        return crc32;

        return crc32c;

    }
@@ -180,6 +184,8 @@ public class MessageDigestUtil { 
        case SHA2:

            return getSha2Instance();

        case CRC32:

            return getCrc32Instance();

        case CRC32C:

        	return getCrc32cInstance();

        default:

            throw new java.lang.UnsupportedOperationException(