Commit 9780093c authored by terrymanu's avatar terrymanu
Browse files

for checkstyle

parent 416d92bc

sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/ShardingProxyClient.java

+2 −2
Original line number Diff line number Diff line
@@ -141,8 +141,8 @@ public final class ShardingProxyClient { 
            for (int i = 0; i < MAX_CONNECTIONS; i++) {

                try {

                    channels[i] = pool.acquire().get(CONNECT_TIMEOUT, TimeUnit.SECONDS);

                } catch (ExecutionException | TimeoutException e) {

                    log.error(e.getMessage(), e);

                } catch (final ExecutionException | TimeoutException ex) {

                    log.error(ex.getMessage(), ex);

                }

            }

            for (int i = 0; i < MAX_CONNECTIONS; i++) {

sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLPacketsBackendHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -179,8 +179,8 @@ public final class SQLPacketsBackendHandler implements BackendHandler { 
            channel = pool.acquire().get(CONNECT_TIMEOUT, TimeUnit.SECONDS);

            MySQLResultCache.getInstance().putConnection(channel.id().asShortText(), connectionId);

            channel.writeAndFlush(commandPacket);

        } catch (InterruptedException | ExecutionException | TimeoutException e) {

            log.error(e.getMessage(), e);

        } catch (final InterruptedException | ExecutionException | TimeoutException ex) {

            log.error(ex.getMessage(), ex);

        } finally {

            if (null != pool && null != channel) {

                pool.release(channel);

sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/mysql/MySQLBackendHandler.java

+6 −6
Original line number Diff line number Diff line
@@ -167,13 +167,13 @@ public class MySQLBackendHandler extends CommandResponsePacketsHandler { 
            byte[] part2 = messageDigest.digest(part1);

            messageDigest.reset();

            messageDigest.update(authPluginData);

            byte[] authResponse = messageDigest.digest(part2);

            for (int i = 0; i < authResponse.length; i++) {

                authResponse[i] = (byte) (authResponse[i] ^ part1[i]);

            byte[] result = messageDigest.digest(part2);

            for (int i = 0; i < result.length; i++) {

                result[i] = (byte) (result[i] ^ part1[i]);

            }

            return authResponse;

        } catch (NoSuchAlgorithmException e) {

            log.error(e.getMessage(), e);

            return result;

        } catch (final NoSuchAlgorithmException ex) {

            log.error(ex.getMessage(), ex);

        }

        return null;

    }

sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/mysql/MySQLQueryResult.java

+13 −14
Original line number Diff line number Diff line
@@ -17,16 +17,7 @@ 


package io.shardingsphere.proxy.backend.mysql;



import java.io.InputStream;

import java.util.Calendar;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.concurrent.BlockingQueue;

import java.util.concurrent.LinkedBlockingQueue;



import com.google.common.collect.Lists;



import io.shardingsphere.core.merger.QueryResult;

import io.shardingsphere.proxy.transport.mysql.packet.MySQLPacket;

import io.shardingsphere.proxy.transport.mysql.packet.MySQLPacketPayload;
@@ -38,6 +29,14 @@ import io.shardingsphere.proxy.transport.mysql.packet.generic.EofPacket; 
import lombok.Getter;

import lombok.extern.slf4j.Slf4j;



import java.io.InputStream;

import java.util.Calendar;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.concurrent.BlockingQueue;

import java.util.concurrent.LinkedBlockingQueue;



/**

 * MySQL packet query result.

 *
@@ -145,8 +144,8 @@ public final class MySQLQueryResult implements QueryResult { 
    private void put(final MySQLPacket mysqlPacket) {

        try {

            resultSet.put(mysqlPacket);

        } catch (InterruptedException e) {

            log.error(e.getMessage(), e);

        } catch (final InterruptedException ex) {

            log.error(ex.getMessage(), ex);

        }

    }
@@ -155,9 +154,9 @@ public final class MySQLQueryResult implements QueryResult { 
        try {

            MySQLPacket mysqlPacket = resultSet.take();

            currentRow = (mysqlPacket instanceof TextResultSetRowPacket) ? (TextResultSetRowPacket) mysqlPacket : null;

            return currentRow == null ? false : true;

        } catch (InterruptedException e) {

            log.error(e.getMessage(), e);

            return null != currentRow;

        } catch (final InterruptedException ex) {

            log.error(ex.getMessage(), ex);

        }

        return false;

    }

sharding-proxy/src/main/java/io/shardingsphere/proxy/util/SynchronizedFuture.java

+2 −2
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ public class SynchronizedFuture<T> implements Future<List<QueryResult>> { 
    public List<QueryResult> get(final long timeout, final TimeUnit unit) {

        try {

            latch.await(timeout, unit);

        } catch (InterruptedException e) {

            log.error(e.getMessage(), e);

        } catch (final InterruptedException ex) {

            log.error(ex.getMessage(), ex);

        }

        return responses;

    }