drill-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sohami <...@git.apache.org>
Subject [GitHub] drill pull request #809: Drill-4335: C++ client changes for supporting encry...
Date Fri, 12 May 2017 00:14:16 GMT
Github user sohami commented on a diff in the pull request:

    https://github.com/apache/drill/pull/809#discussion_r115612998
  
    --- Diff: contrib/native/client/src/clientlib/drillClientImpl.cpp ---
    @@ -854,75 +990,328 @@ void DrillClientImpl::waitForResults(){
         }
     }
     
    -status_t DrillClientImpl::readMsg(ByteBuf_t _buf,
    -        AllocatedBufferPtr* allocatedBuffer,
    +/*
    + *  Decode the length of the message from bufWithLen and then read entire message from
the socket.
    + *  Parameters:
    + *      bufWithLen          - in param  - buffer containing the bytes which has length
of the RPC message/encrypted chunk
    + *      bufferWithLenBytes  - out param - buffer pointer which points to memory allocated
in this function and has the
    + *                                        entire one RPC message / encrypted chunk along
with the length of the message
    + *      lengthBytesLength   - out param - bytes of bufWithLen which contains the length
of the entire RPC message or
    + *                                        encrypted chunk
    + *      lengthDecodeHandler - in param  - function pointer with length decoder to use.
For encrypted chunk we use
    + *                                        lengthDecode and for plain RPC message we use
rpcLengthDecode.
    + *  Return:
    + *      status_t    - QRY_SUCCESS    - In case of success.
    + *                  - QRY_COMM_ERROR/QRY_INTERNAL_ERROR/QRY_CLIENT_OUTOFMEM - In cases
of error.
    + */
    +status_t DrillClientImpl::readLenBytesFromSocket(ByteBuf_t bufWithLen, AllocatedBufferPtr*
bufferWithLenBytes,
    +		uint32_t& lengthBytesLength, lengthDecoder lengthDecodeHandler) {
    +
    +    uint32_t rmsgLen = 0;
    +    size_t bytes_read = 0;
    +    size_t leftover = 0;
    +    boost::system::error_code error;
    +    *bufferWithLenBytes = NULL;
    +    size_t bufferWithLenBytesSize = 0;
    +
    +    bytes_read = (this->*lengthDecodeHandler)(bufWithLen, rmsgLen);
    +    lengthBytesLength = bytes_read;
    +
    +    DRILL_MT_LOG(DRILL_LOG(LOG_TRACE) << "Length bytes = " << bytes_read
<< std::endl;)
    +    DRILL_MT_LOG(DRILL_LOG(LOG_TRACE) << "Msg Length = " << rmsgLen <<
std::endl;)
    +
    +    if(rmsgLen>0){
    +        leftover = LEN_PREFIX_BUFLEN - bytes_read;
    +
    +        // Allocate a buffer for reading all the bytes in bufWithLen and length number
of bytes
    +    	bufferWithLenBytesSize = rmsgLen + bytes_read;
    +        *bufferWithLenBytes = new AllocatedBuffer(bufferWithLenBytesSize);
    +
    +        if(*bufferWithLenBytes == NULL){
    +            return handleQryError(QRY_CLIENT_OUTOFMEM, getMessage(ERR_QRY_OUTOFMEM),
NULL);
    +        }
    +
    +        DRILL_MT_LOG(DRILL_LOG(LOG_TRACE) << "DrillClientImpl::readLenBytesFromSocket:
Allocated and locked buffer: [ "
    +                                          << *bufferWithLenBytes << ", size
= " << bufferWithLenBytesSize << " ]\n";)
    +
    +        // Copy the memory of bufWithLen into bufferWithLenBytesSize
    +        memcpy((*bufferWithLenBytes)->m_pBuffer, bufWithLen, LEN_PREFIX_BUFLEN);
    +
    +        DRILL_MT_LOG(DRILL_LOG(LOG_TRACE) << "Copied bufWithLen into bufferWithLenBytes.
"
    +                                          << "Now reading data (rmsgLen - leftover)
: " << (rmsgLen - leftover)
    +                                          << std::endl;)
    +
    +        // Read the entire data left from socket and copy to currentBuffer.
    +        ByteBuf_t b = (*bufferWithLenBytes)->m_pBuffer + LEN_PREFIX_BUFLEN;
    +        size_t bytesToRead = rmsgLen - leftover;
    +
    +        while(1){
    +            bytes_read = this->m_socket.read_some(boost::asio::buffer(b, bytesToRead),
error);
    +            if(error) break;
    +            DRILL_MT_LOG(DRILL_LOG(LOG_TRACE) << "Data Message: actual bytes read
= " << bytes_read << std::endl;)
    +            if(bytes_read == bytesToRead) break;
    +            bytesToRead -= bytes_read;
    +            b += bytes_read;
    +        }
    +    } else {
    +        return handleQryError(QRY_INTERNAL_ERROR, getMessage(ERR_QRY_INVREADLEN), NULL);
    +    }
    +
    +    return error ? handleQryError(QRY_COMM_ERROR, getMessage(ERR_QRY_COMMERR, error.message().c_str()),
NULL)
    +                 : QRY_SUCCESS;
    +}
    +
    +
    +/*
    + *  Function to read entire RPC message from socket and decode it to InboundRpcMessage
    + *  Parameters:
    + *      _buf            - in param  - Buffer containing the length bytes.
    + *      allocatedBuffer - out param - Buffer containing the length bytes and entire RPC
message bytes.
    + *      msg             - out param - Decoded InBoundRpcMessage from the bytes in allocatedBuffer
    + *  Return:
    + *      status_t    - QRY_SUCCESS   - In case of success.
    + *                  - QRY_COMM_ERROR/QRY_INTERNAL_ERROR/QRY_CLIENT_OUTOFMEM - In cases
of error.
    + */
    +status_t DrillClientImpl::readMsg(ByteBuf_t _buf, AllocatedBufferPtr* allocatedBuffer,
    --- End diff --
    
    Was kept as is based on previous implementation. Will change it to _inBuf_.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message