ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [29/51] [abbrv] incubator-ignite git commit: # IGNITE-61 - Fixing client
Date Tue, 10 Feb 2015 07:03:26 GMT
# IGNITE-61 - Fixing client


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dd1c2d8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dd1c2d8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dd1c2d8a

Branch: refs/heads/ignite-sql-tests
Commit: dd1c2d8a7f0f7e86caed9a3a39fe1d440e7ae852
Parents: 44ab171
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Mon Feb 9 01:18:18 2015 -0800
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Mon Feb 9 01:18:18 2015 -0800

----------------------------------------------------------------------
 .../communication/GridIoMessageFactory.java     |   6 -
 .../tcp/GridMemcachedMessageWrapper.java        | 268 -------------------
 .../tcp/GridTcpMemcachedNioListener.java        |  13 +-
 3 files changed, 1 insertion(+), 286 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd1c2d8a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 0f46e3d..c1c2c54 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -35,7 +35,6 @@ import org.apache.ignite.internal.processors.continuous.*;
 import org.apache.ignite.internal.processors.dataload.*;
 import org.apache.ignite.internal.processors.fs.*;
 import org.apache.ignite.internal.processors.rest.handlers.task.*;
-import org.apache.ignite.internal.processors.rest.protocols.tcp.*;
 import org.apache.ignite.internal.processors.streamer.*;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.lang.*;
@@ -454,11 +453,6 @@ public class GridIoMessageFactory implements MessageFactory {
 
                 break;
 
-            case 78:
-                msg = new GridMemcachedMessageWrapper();
-
-                break;
-
             case 79:
                 msg = new GridStreamerCancelRequest();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd1c2d8a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
deleted file mode 100644
index d086efe..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * 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.ignite.internal.processors.rest.protocols.tcp;
-
-import org.apache.ignite.*;
-import org.apache.ignite.internal.direct.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-
-import java.io.*;
-import java.nio.*;
-import java.nio.charset.*;
-import java.util.*;
-
-import static org.apache.ignite.internal.processors.rest.protocols.tcp.GridMemcachedMessage.*;
-
-/**
- * Memcached message wrapper for direct marshalling.
- */
-public class GridMemcachedMessageWrapper extends MessageAdapter {
-    /** */
-    private static final long serialVersionUID = 3053626103006980626L;
-
-    /** UTF-8 charset. */
-    private static final Charset UTF_8 = Charset.forName("UTF-8");
-
-    /** Stream. */
-    private final DirectByteBufferStream stream = new DirectByteBufferStream(null);
-
-    /**
-     * Memcached message bytes.
-     */
-    private byte[] bytes;
-
-    /**
-     *
-     */
-    public GridMemcachedMessageWrapper() {
-        // No-op.
-    }
-
-    /**
-     * @param msg Message.
-     * @param jdkMarshaller JDK marshaller.
-     * @throws IgniteCheckedException If failed to marshal.
-     */
-    public GridMemcachedMessageWrapper(GridMemcachedMessage msg, Marshaller jdkMarshaller)
throws IgniteCheckedException {
-        bytes = encodeMemcache(msg, jdkMarshaller);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean writeTo(ByteBuffer buf) {
-        stream.setBuffer(buf);
-
-        if (!typeWritten) {
-            if (!buf.hasRemaining())
-                return false;
-
-            stream.writeByte(directType());
-
-            typeWritten = true;
-        }
-
-        stream.writeByteArray(bytes, 0, bytes.length);
-
-        return stream.lastFinished();
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean readFrom(ByteBuffer buf) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@inheritDoc} */
-    @Override public byte directType() {
-        return MEMCACHE_RES_FLAG;
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"})
-    @Override public MessageAdapter clone() {
-        GridMemcachedMessageWrapper _clone = new GridMemcachedMessageWrapper();
-
-        clone0(_clone);
-
-        return _clone;
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void clone0(MessageAdapter _msg) {
-        GridMemcachedMessageWrapper _clone = (GridMemcachedMessageWrapper)_msg;
-
-        _clone.bytes = bytes;
-    }
-
-    /**
-     * Encodes memcache message to a raw byte array.
-     *
-     * @param msg Message being serialized.
-     * @param jdkMarshaller JDK marshaller.
-     * @return Serialized message.
-     * @throws IgniteCheckedException If serialization failed.
-     */
-    private byte[] encodeMemcache(GridMemcachedMessage msg, Marshaller jdkMarshaller) throws
IgniteCheckedException {
-        GridByteArrayList res = new GridByteArrayList(HDR_LEN - 1);
-
-        int keyLen = 0;
-
-        int keyFlags = 0;
-
-        if (msg.key() != null) {
-            ByteArrayOutputStream rawKey = new ByteArrayOutputStream();
-
-            keyFlags = encodeObj(msg.key(), rawKey, jdkMarshaller);
-
-            msg.key(rawKey.toByteArray());
-
-            keyLen = rawKey.size();
-        }
-
-        int dataLen = 0;
-
-        int valFlags = 0;
-
-        if (msg.value() != null) {
-            ByteArrayOutputStream rawVal = new ByteArrayOutputStream();
-
-            valFlags = encodeObj(msg.value(), rawVal, jdkMarshaller);
-
-            msg.value(rawVal.toByteArray());
-
-            dataLen = rawVal.size();
-        }
-
-        int flagsLen = 0;
-
-        if (msg.addFlags())
-            flagsLen = FLAGS_LENGTH;
-
-        res.add(msg.operationCode());
-
-        // Cast is required due to packet layout.
-        res.add((short)keyLen);
-
-        // Cast is required due to packet layout.
-        res.add((byte)flagsLen);
-
-        // Data type is always 0x00.
-        res.add((byte)0x00);
-
-        res.add((short)msg.status());
-
-        res.add(keyLen + flagsLen + dataLen);
-
-        res.add(msg.opaque(), 0, msg.opaque().length);
-
-        // CAS, unused.
-        res.add(0L);
-
-        assert res.size() == HDR_LEN - 1;
-
-        if (flagsLen > 0) {
-            res.add((short) keyFlags);
-            res.add((short) valFlags);
-        }
-
-        assert msg.key() == null || msg.key() instanceof byte[];
-        assert msg.value() == null || msg.value() instanceof byte[];
-
-        if (keyLen > 0)
-            res.add((byte[])msg.key(), 0, ((byte[])msg.key()).length);
-
-        if (dataLen > 0)
-            res.add((byte[])msg.value(), 0, ((byte[])msg.value()).length);
-
-        return res.entireArray();
-    }
-
-    /**
-     * Encodes given object to a byte array and returns flags that describe the type of serialized
object.
-     *
-     * @param obj Object to serialize.
-     * @param out Output stream to which object should be written.
-     * @param jdkMarshaller JDK marshaller.
-     * @return Serialization flags.
-     * @throws IgniteCheckedException If JDK serialization failed.
-     */
-    private int encodeObj(Object obj, ByteArrayOutputStream out, Marshaller jdkMarshaller)
throws IgniteCheckedException {
-        int flags = 0;
-
-        byte[] data = null;
-
-        if (obj instanceof String)
-            data = ((String)obj).getBytes(UTF_8);
-        else if (obj instanceof Boolean) {
-            data = new byte[] {(byte)((Boolean)obj ? '1' : '0')};
-
-            flags |= BOOLEAN_FLAG;
-        }
-        else if (obj instanceof Integer) {
-            data = U.intToBytes((Integer) obj);
-
-            flags |= INT_FLAG;
-        }
-        else if (obj instanceof Long) {
-            data = U.longToBytes((Long)obj);
-
-            flags |= LONG_FLAG;
-        }
-        else if (obj instanceof Date) {
-            data = U.longToBytes(((Date)obj).getTime());
-
-            flags |= DATE_FLAG;
-        }
-        else if (obj instanceof Byte) {
-            data = new byte[] {(Byte)obj};
-
-            flags |= BYTE_FLAG;
-        }
-        else if (obj instanceof Float) {
-            data = U.intToBytes(Float.floatToIntBits((Float)obj));
-
-            flags |= FLOAT_FLAG;
-        }
-        else if (obj instanceof Double) {
-            data = U.longToBytes(Double.doubleToLongBits((Double)obj));
-
-            flags |= DOUBLE_FLAG;
-        }
-        else if (obj instanceof byte[]) {
-            data = (byte[])obj;
-
-            flags |= BYTE_ARR_FLAG;
-        }
-        else {
-            jdkMarshaller.marshal(obj, out);
-
-            flags |= SERIALIZED_FLAG;
-        }
-
-        if (data != null)
-            out.write(data, 0, data.length);
-
-        return flags;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(GridMemcachedMessageWrapper.class, this);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd1c2d8a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
index 070546e..43e47cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
@@ -244,18 +244,7 @@ public class GridTcpMemcachedNioListener extends GridNioServerListenerAdapter<Gr
      * @return NIO send future.
      */
     private GridNioFuture<?> sendResponse(GridNioSession ses, GridMemcachedMessage
res) {
-        try {
-            GridMemcachedMessageWrapper wrapper = new GridMemcachedMessageWrapper(res, jdkMarshaller);
-
-            return ses.send(wrapper);
-        }
-        catch (IgniteCheckedException e) {
-            U.error(log, "Failed to marshal response: " + res, e);
-
-            ses.close();
-
-            return new GridNioFinishedFuture<>(e);
-        }
+        return ses.send(res);
     }
 
     /**


Mime
View raw message