You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ns...@apache.org on 2016/03/05 14:56:00 UTC
[1/3] thrift git commit: THRIFT-3569 Add thrift_transport_read_all to
facilitate large reads in c_glib. Client: c_glib Patch: Chandler May
Repository: thrift
Updated Branches:
refs/heads/master 6ec686080 -> d9b4425f6
THRIFT-3569 Add thrift_transport_read_all to facilitate large reads in c_glib.
Client: c_glib
Patch: Chandler May
This closes #849
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/1ccd81bf
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/1ccd81bf
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/1ccd81bf
Branch: refs/heads/master
Commit: 1ccd81bfbc7dc09dc7a8a5e64f313935b799c833
Parents: 2cc4764
Author: Chandler May <cj...@gmail.com>
Authored: Thu Feb 11 08:25:25 2016 -0500
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Sat Mar 5 22:53:28 2016 +0900
----------------------------------------------------------------------
.../c_glib/protocol/thrift_binary_protocol.c | 32 +--
.../c_glib/protocol/thrift_compact_protocol.c | 22 +-
.../thrift/c_glib/transport/thrift_transport.c | 38 +++-
.../thrift/c_glib/transport/thrift_transport.h | 9 +
lib/c_glib/test/Makefile.am | 2 +
lib/c_glib/test/testbinaryprotocol.c | 164 ++++++++++++++-
lib/c_glib/test/testcompactprotocol.c | 208 ++++++++++++++++++-
7 files changed, 438 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/1ccd81bf/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.c
----------------------------------------------------------------------
diff --git a/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.c b/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.c
index 358396c..48a2c5c 100644
--- a/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.c
+++ b/lib/c_glib/src/thrift/c_glib/protocol/thrift_binary_protocol.c
@@ -645,8 +645,8 @@ thrift_binary_protocol_read_bool (ThriftProtocol *protocol, gboolean *value,
g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
if ((ret =
- thrift_transport_read (protocol->transport,
- b, 1, error)) < 0)
+ thrift_transport_read_all (protocol->transport,
+ b, 1, error)) < 0)
{
return -1;
}
@@ -664,8 +664,8 @@ thrift_binary_protocol_read_byte (ThriftProtocol *protocol, gint8 *value,
g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
if ((ret =
- thrift_transport_read (protocol->transport,
- b, 1, error)) < 0)
+ thrift_transport_read_all (protocol->transport,
+ b, 1, error)) < 0)
{
return -1;
}
@@ -687,8 +687,8 @@ thrift_binary_protocol_read_i16 (ThriftProtocol *protocol, gint16 *value,
g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
if ((ret =
- thrift_transport_read (protocol->transport,
- b.byte_array, 2, error)) < 0)
+ thrift_transport_read_all (protocol->transport,
+ b.byte_array, 2, error)) < 0)
{
return -1;
}
@@ -710,8 +710,8 @@ thrift_binary_protocol_read_i32 (ThriftProtocol *protocol, gint32 *value,
g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
if ((ret =
- thrift_transport_read (protocol->transport,
- b.byte_array, 4, error)) < 0)
+ thrift_transport_read_all (protocol->transport,
+ b.byte_array, 4, error)) < 0)
{
return -1;
}
@@ -733,8 +733,8 @@ thrift_binary_protocol_read_i64 (ThriftProtocol *protocol, gint64 *value,
g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
if ((ret =
- thrift_transport_read (protocol->transport,
- b.byte_array, 8, error)) < 0)
+ thrift_transport_read_all (protocol->transport,
+ b.byte_array, 8, error)) < 0)
{
return -1;
}
@@ -756,8 +756,8 @@ thrift_binary_protocol_read_double (ThriftProtocol *protocol,
g_return_val_if_fail (THRIFT_IS_BINARY_PROTOCOL (protocol), -1);
if ((ret =
- thrift_transport_read (protocol->transport,
- b.byte_array, 8, error)) < 0)
+ thrift_transport_read_all (protocol->transport,
+ b.byte_array, 8, error)) < 0)
{
return -1;
}
@@ -790,8 +790,8 @@ thrift_binary_protocol_read_string (ThriftProtocol *protocol,
len = (guint32) read_len + 1; /* space for null terminator */
*str = g_new0 (gchar, len);
if ((ret =
- thrift_transport_read (protocol->transport,
- *str, read_len, error)) < 0)
+ thrift_transport_read_all (protocol->transport,
+ *str, read_len, error)) < 0)
{
g_free (*str);
*str = NULL;
@@ -831,8 +831,8 @@ thrift_binary_protocol_read_binary (ThriftProtocol *protocol,
*len = (guint32) read_len;
*buf = g_new (guchar, *len);
if ((ret =
- thrift_transport_read (protocol->transport,
- *buf, *len, error)) < 0)
+ thrift_transport_read_all (protocol->transport,
+ *buf, *len, error)) < 0)
{
g_free (*buf);
*buf = NULL;
http://git-wip-us.apache.org/repos/asf/thrift/blob/1ccd81bf/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.c
----------------------------------------------------------------------
diff --git a/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.c b/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.c
index 5ff33b3..87b6b30 100644
--- a/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.c
+++ b/lib/c_glib/src/thrift/c_glib/protocol/thrift_compact_protocol.c
@@ -269,20 +269,22 @@ thrift_compact_protocol_read_varint64 (ThriftCompactProtocol *protocol,
gint64 *i64,
GError **error)
{
+ ThriftProtocol *tp;
gint32 ret;
gint32 xfer;
guint64 val;
gint shift;
guint8 byte;
+ tp = THRIFT_PROTOCOL (protocol);
xfer = 0;
val = 0;
shift = 0;
byte = 0;
while (TRUE) {
- if ((ret = thrift_transport_read (THRIFT_PROTOCOL (protocol)->transport,
- (gpointer) &byte, 1, error)) < 0) {
+ if ((ret = thrift_transport_read_all (tp->transport,
+ (gpointer) &byte, 1, error)) < 0) {
return -1;
}
++xfer;
@@ -1243,8 +1245,8 @@ thrift_compact_protocol_read_byte (ThriftProtocol *protocol, gint8 *value,
g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
if ((ret =
- thrift_transport_read (protocol->transport,
- b, 1, error)) < 0) {
+ thrift_transport_read_all (protocol->transport,
+ b, 1, error)) < 0) {
return -1;
}
*value = *(gint8 *) b;
@@ -1344,8 +1346,8 @@ thrift_compact_protocol_read_double (ThriftProtocol *protocol,
g_return_val_if_fail (THRIFT_IS_COMPACT_PROTOCOL (protocol), -1);
if ((ret =
- thrift_transport_read (protocol->transport,
- u.b, 8, error)) < 0) {
+ thrift_transport_read_all (protocol->transport,
+ u.b, 8, error)) < 0) {
return -1;
}
u.bits = GUINT64_FROM_LE (u.bits);
@@ -1390,8 +1392,8 @@ thrift_compact_protocol_read_string (ThriftProtocol *protocol,
/* allocate the memory as an array of unsigned char for binary data */
*str = g_new0 (gchar, read_len + 1);
if ((ret =
- thrift_transport_read (protocol->transport,
- *str, read_len, error)) < 0) {
+ thrift_transport_read_all (protocol->transport,
+ *str, read_len, error)) < 0) {
g_free (*str);
*str = NULL;
return -1;
@@ -1452,8 +1454,8 @@ thrift_compact_protocol_read_binary (ThriftProtocol *protocol,
*len = (guint32) read_len;
*buf = g_new (guchar, *len);
if ((ret =
- thrift_transport_read (protocol->transport,
- *buf, *len, error)) < 0) {
+ thrift_transport_read_all (protocol->transport,
+ *buf, *len, error)) < 0) {
g_free (*buf);
*buf = NULL;
*len = 0;
http://git-wip-us.apache.org/repos/asf/thrift/blob/1ccd81bf/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.c
----------------------------------------------------------------------
diff --git a/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.c
index 5533437..9dd2671 100644
--- a/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.c
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.c
@@ -85,6 +85,14 @@ thrift_transport_flush (ThriftTransport *transport, GError **error)
return THRIFT_TRANSPORT_GET_CLASS (transport)->flush (transport, error);
}
+gint32
+thrift_transport_read_all (ThriftTransport *transport, gpointer buf,
+ guint32 len, GError **error)
+{
+ return THRIFT_TRANSPORT_GET_CLASS (transport)->read_all (transport, buf,
+ len, error);
+}
+
/* by default, peek returns true if and only if the transport is open */
static gboolean
thrift_transport_real_peek (ThriftTransport *transport, GError **error)
@@ -94,6 +102,33 @@ thrift_transport_real_peek (ThriftTransport *transport, GError **error)
return THRIFT_TRANSPORT_GET_CLASS (transport)->is_open (transport);
}
+static gint32
+thrift_transport_real_read_all (ThriftTransport *transport, gpointer buf,
+ guint32 len, GError **error)
+{
+ ThriftTransportClass *ttc;
+ guint32 have;
+ gint32 ret;
+ gint8 *bytes;
+
+ THRIFT_UNUSED_VAR (error);
+
+ ttc = THRIFT_TRANSPORT_GET_CLASS (transport);
+ have = 0;
+ ret = 0;
+ bytes = (gint8*) buf;
+
+ while (have < len) {
+ if ((ret = ttc->read (transport, (gpointer) (bytes + have), len - have,
+ error)) < 0) {
+ return ret;
+ }
+ have += ret;
+ }
+
+ return have;
+}
+
/* define the GError domain for Thrift transports */
GQuark
thrift_transport_error_quark (void)
@@ -115,8 +150,9 @@ thrift_transport_class_init (ThriftTransportClass *cls)
cls->write_end = thrift_transport_write_end;
cls->flush = thrift_transport_flush;
- /* provide a default implementation for the peek method */
+ /* provide a default implementation for the peek and read_all methods */
cls->peek = thrift_transport_real_peek;
+ cls->read_all = thrift_transport_real_read_all;
}
static void
http://git-wip-us.apache.org/repos/asf/thrift/blob/1ccd81bf/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.h
----------------------------------------------------------------------
diff --git a/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.h b/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.h
index 5555a5e..94bb6f5 100644
--- a/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.h
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_transport.h
@@ -73,6 +73,8 @@ struct _ThriftTransportClass
const guint32 len, GError **error);
gboolean (*write_end) (ThriftTransport *transport, GError **error);
gboolean (*flush) (ThriftTransport *transport, GError **error);
+ gint32 (*read_all) (ThriftTransport *transport, gpointer buf,
+ guint32 len, GError **error);
};
/* used by THRIFT_TYPE_TRANSPORT */
@@ -143,6 +145,13 @@ gboolean thrift_transport_write_end (ThriftTransport *transport,
*/
gboolean thrift_transport_flush (ThriftTransport *transport, GError **error);
+/*!
+ * Read len bytes of data into the buffer buf.
+ * \public \memberof ThriftTransportInterface
+ */
+gint32 thrift_transport_read_all (ThriftTransport *transport, gpointer buf,
+ guint32 len, GError **error);
+
/* define error/exception types */
typedef enum
{
http://git-wip-us.apache.org/repos/asf/thrift/blob/1ccd81bf/lib/c_glib/test/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/c_glib/test/Makefile.am b/lib/c_glib/test/Makefile.am
index 41ed4d1..3dc5418 100755
--- a/lib/c_glib/test/Makefile.am
+++ b/lib/c_glib/test/Makefile.am
@@ -104,6 +104,7 @@ testbinaryprotocol_SOURCES = testbinaryprotocol.c
testbinaryprotocol_LDADD = \
$(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
$(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_framed_transport.o \
$(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
$(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
$(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o
@@ -112,6 +113,7 @@ testcompactprotocol_SOURCES = testcompactprotocol.c
testcompactprotocol_LDADD = \
$(top_builddir)/lib/c_glib/src/thrift/c_glib/protocol/libthrift_c_glib_la-thrift_protocol.o \
$(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_transport.o \
+ $(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_framed_transport.o \
$(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_socket.o \
$(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_transport.o \
$(top_builddir)/lib/c_glib/src/thrift/c_glib/transport/libthrift_c_glib_la-thrift_server_socket.o
http://git-wip-us.apache.org/repos/asf/thrift/blob/1ccd81bf/lib/c_glib/test/testbinaryprotocol.c
----------------------------------------------------------------------
diff --git a/lib/c_glib/test/testbinaryprotocol.c b/lib/c_glib/test/testbinaryprotocol.c
index 349460a..7ca5150 100755
--- a/lib/c_glib/test/testbinaryprotocol.c
+++ b/lib/c_glib/test/testbinaryprotocol.c
@@ -36,6 +36,7 @@
#include <thrift/c_glib/protocol/thrift_protocol.h>
#include <thrift/c_glib/transport/thrift_socket.h>
#include <thrift/c_glib/transport/thrift_server_socket.h>
+#include <thrift/c_glib/transport/thrift_framed_transport.h>
#define TEST_BOOL TRUE
#define TEST_BYTE 123
@@ -50,14 +51,14 @@ static int transport_read_count = 0;
static int transport_read_error = 0;
static int transport_read_error_at = -1;
gint32
-my_thrift_transport_read (ThriftTransport *transport, gpointer buf,
- guint32 len, GError **error)
+my_thrift_transport_read_all (ThriftTransport *transport, gpointer buf,
+ guint32 len, GError **error)
{
if (transport_read_count != transport_read_error_at
&& transport_read_error == 0)
{
transport_read_count++;
- return thrift_transport_read (transport, buf, len, error);
+ return thrift_transport_read_all (transport, buf, len, error);
}
return -1;
}
@@ -78,14 +79,15 @@ my_thrift_transport_write (ThriftTransport *transport, const gpointer buf,
return FALSE;
}
-#define thrift_transport_read my_thrift_transport_read
+#define thrift_transport_read_all my_thrift_transport_read_all
#define thrift_transport_write my_thrift_transport_write
#include "../src/thrift/c_glib/protocol/thrift_binary_protocol.c"
-#undef thrift_transport_read
+#undef thrift_transport_read_all
#undef thrift_transport_write
static void thrift_server_primitives (const int port);
static void thrift_server_complex_types (const int port);
+static void thrift_server_many_frames (const int port);
static void
test_create_and_destroy(void)
@@ -389,6 +391,91 @@ test_read_and_write_complex_types (void)
}
}
+static void
+test_read_and_write_many_frames (void)
+{
+ int status;
+ pid_t pid;
+ ThriftSocket *tsocket = NULL;
+ ThriftTransport *transport = NULL;
+ ThriftFramedTransport *ft = NULL;
+ ThriftBinaryProtocol *tb = NULL;
+ ThriftProtocol *protocol = NULL;
+ gpointer binary = (gpointer *) TEST_STRING;
+ const guint32 len = strlen (TEST_STRING);
+ int port = TEST_PORT;
+
+ /* fork a server from the client */
+ pid = fork ();
+ assert (pid >= 0);
+
+ if (pid == 0)
+ {
+ /* child listens */
+ thrift_server_many_frames (port);
+ exit (0);
+ } else {
+ /* parent. wait a bit for the socket to be created. */
+ sleep (1);
+
+ /* create a ThriftSocket */
+ tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
+ "port", port, NULL);
+ assert (tsocket != NULL);
+ transport = THRIFT_TRANSPORT (tsocket);
+
+ /* wrap in a framed transport */
+ ft = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT, "transport", transport,
+ "w_buf_size", 1, NULL);
+ assert (ft != NULL);
+ transport = THRIFT_TRANSPORT (ft);
+
+ thrift_transport_open (transport, NULL);
+ assert (thrift_transport_is_open (transport));
+
+ /* create a binary protocol */
+ tb = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL, "transport",
+ transport, NULL);
+ protocol = THRIFT_PROTOCOL (tb);
+ assert (protocol != NULL);
+
+ /* write a bunch of primitives */
+ assert (thrift_binary_protocol_write_bool (protocol, TEST_BOOL, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_binary_protocol_write_byte (protocol, TEST_BYTE, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_binary_protocol_write_i16 (protocol, TEST_I16, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_binary_protocol_write_i32 (protocol, TEST_I32, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_binary_protocol_write_i64 (protocol, TEST_I64, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_binary_protocol_write_double (protocol,
+ TEST_DOUBLE, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_binary_protocol_write_string (protocol,
+ TEST_STRING, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_binary_protocol_write_binary (protocol, binary,
+ len, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_binary_protocol_write_binary (protocol, NULL, 0, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_binary_protocol_write_binary (protocol, binary,
+ len, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+
+ /* clean up */
+ thrift_transport_write_end (transport, NULL);
+ thrift_transport_close (transport, NULL);
+ g_object_unref (ft);
+ g_object_unref (tsocket);
+ g_object_unref (tb);
+ assert (wait (&status) == pid);
+ assert (status == 0);
+ }
+}
+
static void
thrift_server_primitives (const int port)
@@ -666,6 +753,71 @@ thrift_server_complex_types (const int port)
g_object_unref (tsocket);
}
+static void
+thrift_server_many_frames (const int port)
+{
+ ThriftServerTransport *transport = NULL;
+ ThriftTransport *client = NULL;
+ ThriftBinaryProtocol *tbp = NULL;
+ ThriftProtocol *protocol = NULL;
+ ThriftServerSocket *tsocket = NULL;
+ gboolean value_boolean = FALSE;
+ gint8 value_byte = 0;
+ gint16 value_16 = 0;
+ gint32 value_32 = 0;
+ gint64 value_64 = 0;
+ gdouble value_double = 0;
+ gchar *string = NULL;
+ gpointer binary = NULL;
+ guint32 len = 0;
+ void *comparator = (void *) TEST_STRING;
+
+ tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET, "port", port, NULL);
+ transport = THRIFT_SERVER_TRANSPORT (tsocket);
+ thrift_server_transport_listen (transport, NULL);
+
+ /* wrap the client in a framed transport */
+ client = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT, "transport",
+ thrift_server_transport_accept (transport, NULL),
+ "r_buf_size", 1, NULL);
+ assert (client != NULL);
+
+ tbp = g_object_new (THRIFT_TYPE_BINARY_PROTOCOL, "transport",
+ client, NULL);
+ protocol = THRIFT_PROTOCOL (tbp);
+
+ assert (thrift_binary_protocol_read_bool (protocol,
+ &value_boolean, NULL) > 0);
+ assert (thrift_binary_protocol_read_byte (protocol, &value_byte, NULL) > 0);
+ assert (thrift_binary_protocol_read_i16 (protocol, &value_16, NULL) > 0);
+ assert (thrift_binary_protocol_read_i32 (protocol, &value_32, NULL) > 0);
+ assert (thrift_binary_protocol_read_i64 (protocol, &value_64, NULL) > 0);
+ assert (thrift_binary_protocol_read_double (protocol,
+ &value_double, NULL) > 0);
+ assert (thrift_binary_protocol_read_string (protocol, &string, NULL) > 0);
+ assert (thrift_binary_protocol_read_binary (protocol, &binary,
+ &len, NULL) > 0);
+
+ assert (value_boolean == TEST_BOOL);
+ assert (value_byte == TEST_BYTE);
+ assert (value_16 == TEST_I16);
+ assert (value_32 == TEST_I32);
+ assert (value_64 == TEST_I64);
+ assert (value_double == TEST_DOUBLE);
+ assert (strcmp (TEST_STRING, string) == 0);
+ assert (memcmp (comparator, binary, len) == 0);
+
+ g_free (string);
+ g_free (binary);
+
+ thrift_transport_read_end (client, NULL);
+ thrift_transport_close (client, NULL);
+
+ g_object_unref (tbp);
+ g_object_unref (client);
+ g_object_unref (tsocket);
+}
+
int
main(int argc, char *argv[])
{
@@ -679,6 +831,8 @@ main(int argc, char *argv[])
g_test_add_func ("/testbinaryprotocol/Initialize", test_initialize);
g_test_add_func ("/testbinaryprotocol/ReadAndWritePrimitives", test_read_and_write_primitives);
g_test_add_func ("/testbinaryprotocol/ReadAndWriteComplexTypes", test_read_and_write_complex_types);
+ g_test_add_func ("/testbinaryprotocol/ReadAndWriteManyFrames",
+ test_read_and_write_many_frames);
return g_test_run ();
}
http://git-wip-us.apache.org/repos/asf/thrift/blob/1ccd81bf/lib/c_glib/test/testcompactprotocol.c
----------------------------------------------------------------------
diff --git a/lib/c_glib/test/testcompactprotocol.c b/lib/c_glib/test/testcompactprotocol.c
index 3d16dc0..9b57a8c 100755
--- a/lib/c_glib/test/testcompactprotocol.c
+++ b/lib/c_glib/test/testcompactprotocol.c
@@ -40,6 +40,7 @@
#include <thrift/c_glib/protocol/thrift_protocol.h>
#include <thrift/c_glib/transport/thrift_socket.h>
#include <thrift/c_glib/transport/thrift_server_socket.h>
+#include <thrift/c_glib/transport/thrift_framed_transport.h>
#define TEST_BOOL TRUE
#define TEST_BYTE 123
@@ -57,14 +58,14 @@ static int transport_read_count = 0;
static int transport_read_error = 0;
static int transport_read_error_at = -1;
gint32
-my_thrift_transport_read (ThriftTransport *transport, gpointer buf,
- guint32 len, GError **error)
+my_thrift_transport_read_all (ThriftTransport *transport, gpointer buf,
+ guint32 len, GError **error)
{
if (transport_read_count != transport_read_error_at
&& transport_read_error == 0)
{
transport_read_count++;
- return thrift_transport_read (transport, buf, len, error);
+ return thrift_transport_read_all (transport, buf, len, error);
}
return -1;
}
@@ -85,14 +86,15 @@ my_thrift_transport_write (ThriftTransport *transport, const gpointer buf,
return FALSE;
}
-#define thrift_transport_read my_thrift_transport_read
+#define thrift_transport_read_all my_thrift_transport_read_all
#define thrift_transport_write my_thrift_transport_write
#include "../src/thrift/c_glib/protocol/thrift_compact_protocol.c"
-#undef thrift_transport_read
+#undef thrift_transport_read_all
#undef thrift_transport_write
static void thrift_server_primitives (const int port);
static void thrift_server_complex_types (const int port);
+static void thrift_server_many_frames (const int port);
static void
test_create_and_destroy (void)
@@ -549,6 +551,112 @@ test_read_and_write_complex_types (void)
}
}
+static void
+test_read_and_write_many_frames (void)
+{
+ int status;
+ pid_t pid;
+ ThriftSocket *tsocket = NULL;
+ ThriftTransport *transport = NULL;
+ ThriftFramedTransport *ft = NULL;
+ ThriftCompactProtocol *tc = NULL;
+ ThriftProtocol *protocol = NULL;
+ gpointer binary = (gpointer *) TEST_STRING;
+ const guint32 len = strlen (TEST_STRING);
+ int port = TEST_PORT;
+
+ /* fork a server from the client */
+ pid = fork ();
+ assert (pid >= 0);
+
+ if (pid == 0)
+ {
+ /* child listens */
+ thrift_server_many_frames (port);
+ exit (0);
+ } else {
+ /* parent. wait a bit for the socket to be created. */
+ sleep (1);
+
+ /* create a ThriftSocket */
+ tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
+ "port", port, NULL);
+ assert (tsocket != NULL);
+ transport = THRIFT_TRANSPORT (tsocket);
+
+ /* wrap in a framed transport */
+ ft = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT, "transport", transport,
+ "w_buf_size", 1, NULL);
+ assert (ft != NULL);
+ transport = THRIFT_TRANSPORT (ft);
+
+ thrift_transport_open (transport, NULL);
+ assert (thrift_transport_is_open (transport));
+
+ /* create a compact protocol */
+ tc = g_object_new (THRIFT_TYPE_COMPACT_PROTOCOL, "transport",
+ transport, NULL);
+ protocol = THRIFT_PROTOCOL (tc);
+ assert (protocol != NULL);
+
+ /* write a bunch of primitives */
+ assert (thrift_compact_protocol_write_bool (protocol, TEST_BOOL,
+ NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_byte (protocol, TEST_BYTE,
+ NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_i16 (protocol, TEST_I16, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_i32 (protocol, TEST_I32, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_i64 (protocol, TEST_I64, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_i16 (protocol, TEST_NI16, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_i32 (protocol, TEST_NI32, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_i64 (protocol, TEST_NI64, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_i16 (protocol, 2, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_i32 (protocol, 2, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_i64 (protocol, 2, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_i16 (protocol, -2, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_i32 (protocol, -2, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_i64 (protocol, -2, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_double (protocol,
+ TEST_DOUBLE, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_string (protocol,
+ TEST_STRING, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_binary (protocol, binary,
+ len, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_binary (protocol, NULL,
+ 0, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+ assert (thrift_compact_protocol_write_binary (protocol, binary,
+ len, NULL) > 0);
+ thrift_transport_flush (transport, NULL);
+
+ /* clean up */
+ thrift_transport_write_end (transport, NULL);
+ thrift_transport_close (transport, NULL);
+ g_object_unref (ft);
+ g_object_unref (tsocket);
+ g_object_unref (tc);
+ assert (wait (&status) == pid);
+ assert (status == 0);
+ }
+}
+
static void
thrift_server_primitives (const int port)
@@ -1053,6 +1161,94 @@ thrift_server_complex_types (const int port)
g_object_unref (tsocket);
}
+static void
+thrift_server_many_frames (const int port)
+{
+ ThriftServerTransport *transport = NULL;
+ ThriftTransport *client = NULL;
+ ThriftCompactProtocol *tcp = NULL;
+ ThriftProtocol *protocol = NULL;
+ ThriftServerSocket *tsocket = NULL;
+ gboolean value_boolean = FALSE;
+ gint8 value_byte = 0,
+ zigzag_p16 = 0, zigzag_p32 = 0, zigzag_p64 = 0,
+ zigzag_n16 = 0, zigzag_n32 = 0, zigzag_n64 = 0;
+ gint16 value_16 = 0;
+ gint32 value_32 = 0;
+ gint64 value_64 = 0;
+ gint16 value_n16 = 0;
+ gint32 value_n32 = 0;
+ gint64 value_n64 = 0;
+ gdouble value_double = 0;
+ gchar *string = NULL;
+ gpointer binary = NULL;
+ guint32 len = 0;
+ void *comparator = (void *) TEST_STRING;
+
+ tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET, "port", port, NULL);
+ transport = THRIFT_SERVER_TRANSPORT (tsocket);
+ thrift_server_transport_listen (transport, NULL);
+
+ /* wrap the client in a framed transport */
+ client = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT, "transport",
+ thrift_server_transport_accept (transport, NULL),
+ "r_buf_size", 1, NULL);
+ assert (client != NULL);
+
+ tcp = g_object_new (THRIFT_TYPE_COMPACT_PROTOCOL, "transport",
+ client, NULL);
+ protocol = THRIFT_PROTOCOL (tcp);
+
+ assert (thrift_compact_protocol_read_bool (protocol,
+ &value_boolean, NULL) > 0);
+ assert (thrift_compact_protocol_read_byte (protocol, &value_byte, NULL) > 0);
+ assert (thrift_compact_protocol_read_i16 (protocol, &value_16, NULL) > 0);
+ assert (thrift_compact_protocol_read_i32 (protocol, &value_32, NULL) > 0);
+ assert (thrift_compact_protocol_read_i64 (protocol, &value_64, NULL) > 0);
+ assert (thrift_compact_protocol_read_i16 (protocol, &value_n16, NULL) > 0);
+ assert (thrift_compact_protocol_read_i32 (protocol, &value_n32, NULL) > 0);
+ assert (thrift_compact_protocol_read_i64 (protocol, &value_n64, NULL) > 0);
+ assert (thrift_compact_protocol_read_byte (protocol, &zigzag_p16, NULL) > 0);
+ assert (thrift_compact_protocol_read_byte (protocol, &zigzag_p32, NULL) > 0);
+ assert (thrift_compact_protocol_read_byte (protocol, &zigzag_p64, NULL) > 0);
+ assert (thrift_compact_protocol_read_byte (protocol, &zigzag_n16, NULL) > 0);
+ assert (thrift_compact_protocol_read_byte (protocol, &zigzag_n32, NULL) > 0);
+ assert (thrift_compact_protocol_read_byte (protocol, &zigzag_n64, NULL) > 0);
+ assert (thrift_compact_protocol_read_double (protocol,
+ &value_double, NULL) > 0);
+ assert (thrift_compact_protocol_read_string (protocol, &string, NULL) > 0);
+ assert (thrift_compact_protocol_read_binary (protocol, &binary,
+ &len, NULL) > 0);
+
+ assert (value_boolean == TEST_BOOL);
+ assert (value_byte == TEST_BYTE);
+ assert (value_16 == TEST_I16);
+ assert (value_32 == TEST_I32);
+ assert (value_64 == TEST_I64);
+ assert (value_n16 == TEST_NI16);
+ assert (value_n32 == TEST_NI32);
+ assert (value_n64 == TEST_NI64);
+ assert (zigzag_p16 == 4);
+ assert (zigzag_p32 == 4);
+ assert (zigzag_p64 == 4);
+ assert (zigzag_n16 == 3);
+ assert (zigzag_n32 == 3);
+ assert (zigzag_n64 == 3);
+ assert (value_double == TEST_DOUBLE);
+ assert (strcmp (TEST_STRING, string) == 0);
+ assert (memcmp (comparator, binary, len) == 0);
+
+ g_free (string);
+ g_free (binary);
+
+ thrift_transport_read_end (client, NULL);
+ thrift_transport_close (client, NULL);
+
+ g_object_unref (tcp);
+ g_object_unref (client);
+ g_object_unref (tsocket);
+}
+
int
main (int argc, char *argv[])
{
@@ -1069,6 +1265,8 @@ main (int argc, char *argv[])
test_read_and_write_primitives);
g_test_add_func ("/testcompactprotocol/ReadAndWriteComplexTypes",
test_read_and_write_complex_types);
+ g_test_add_func ("/testcompactprotocol/ReadAndWriteManyFrames",
+ test_read_and_write_many_frames);
return g_test_run ();
}
[3/3] thrift git commit: follow-up: THRIFT-3599 Validate client IP
address against cert's SubjectAltName Client: Python Patch: Nobuaki Sukegawa
Posted by ns...@apache.org.
follow-up: THRIFT-3599 Validate client IP address against cert's SubjectAltName
Client: Python
Patch: Nobuaki Sukegawa
Fix required version of Python or dependency
This closes #914
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/d9b4425f
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/d9b4425f
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/d9b4425f
Branch: refs/heads/master
Commit: d9b4425f68b8a239e6085f2700bfc2f95cdb2f46
Parents: 1ccd81b
Author: Nobuaki Sukegawa <ns...@apache.org>
Authored: Tue Mar 1 02:09:11 2016 +0900
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Sat Mar 5 22:53:48 2016 +0900
----------------------------------------------------------------------
lib/py/requirements.txt | 2 +-
lib/py/src/transport/TSSLSocket.py | 4 ++--
lib/py/src/transport/sslcompat.py | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/d9b4425f/lib/py/requirements.txt
----------------------------------------------------------------------
diff --git a/lib/py/requirements.txt b/lib/py/requirements.txt
index 7cf8b31..2254a28 100644
--- a/lib/py/requirements.txt
+++ b/lib/py/requirements.txt
@@ -1,3 +1,3 @@
six
-backports.ssl_match_hostname
+backports.ssl_match_hostname >= 3.5
ipaddress
http://git-wip-us.apache.org/repos/asf/thrift/blob/d9b4425f/lib/py/src/transport/TSSLSocket.py
----------------------------------------------------------------------
diff --git a/lib/py/src/transport/TSSLSocket.py b/lib/py/src/transport/TSSLSocket.py
index e57a0d4..12bc356 100644
--- a/lib/py/src/transport/TSSLSocket.py
+++ b/lib/py/src/transport/TSSLSocket.py
@@ -385,8 +385,8 @@ class TSSLServerSocket(TSocket.TServerSocket, TSSLBase):
self._validate_callback(client.peercert, addr[0])
client.is_valid = True
except Exception:
- logger.warn('Failed to validate client certificate address',
- exc_info=True)
+ logger.warn('Failed to validate client certificate address: %s',
+ addr[0], exc_info=True)
client.close()
plain_client.close()
return None
http://git-wip-us.apache.org/repos/asf/thrift/blob/d9b4425f/lib/py/src/transport/sslcompat.py
----------------------------------------------------------------------
diff --git a/lib/py/src/transport/sslcompat.py b/lib/py/src/transport/sslcompat.py
index 2d778d2..19cfaca 100644
--- a/lib/py/src/transport/sslcompat.py
+++ b/lib/py/src/transport/sslcompat.py
@@ -17,6 +17,8 @@
# under the License.
#
+import sys
+
from thrift.transport.TTransport import TTransportException
@@ -69,9 +71,10 @@ try:
from backports.ssl_match_hostname import match_hostname
_match_hostname = match_hostname
except ImportError:
+ if sys.hexversion < 0x030500F0:
+ _match_has_ipaddress = False
try:
from ssl import match_hostname
_match_hostname = match_hostname
except ImportError:
_match_hostname = legacy_validate_callback
- _match_has_ipaddress = False
[2/3] thrift git commit: THRIFT-3713 lib/d/test/thrift_test_runner.sh
is flaky on Jenkins Client: Test (D) Patch: Nobuaki Sukegawa
Posted by ns...@apache.org.
THRIFT-3713 lib/d/test/thrift_test_runner.sh is flaky on Jenkins
Client: Test (D)
Patch: Nobuaki Sukegawa
This closes #925
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/2cc4764d
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/2cc4764d
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/2cc4764d
Branch: refs/heads/master
Commit: 2cc4764d0e4851b9024c53353235abe586a9835a
Parents: 6ec6860
Author: Nobuaki Sukegawa <ns...@apache.org>
Authored: Sat Mar 5 16:07:37 2016 +0900
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Sat Mar 5 22:53:28 2016 +0900
----------------------------------------------------------------------
lib/d/test/thrift_test_runner.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/2cc4764d/lib/d/test/thrift_test_runner.sh
----------------------------------------------------------------------
diff --git a/lib/d/test/thrift_test_runner.sh b/lib/d/test/thrift_test_runner.sh
index 27479c9..51bfe99 100755
--- a/lib/d/test/thrift_test_runner.sh
+++ b/lib/d/test/thrift_test_runner.sh
@@ -51,7 +51,11 @@ for protocol in $protocols; do
# Give the server some time to get up and check if it runs (yes, this
# is a huge kludge, should add a connect timeout to test client).
client_rc=-1
- sleep 0.01
+ if [ "$server" = "taskpool" ]; then
+ sleep 0.5
+ else
+ sleep 0.02
+ fi
kill -0 $server_pid 2>/dev/null
if [ $? -eq 0 ]; then
${CUR}/thrift_test_client $args --numTests=10 > /dev/null