You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by dr...@apache.org on 2010/08/31 00:05:56 UTC
svn commit: r990998 - in /incubator/thrift/trunk/lib/erl: include/ src/
Author: dreiss
Date: Mon Aug 30 22:05:55 2010
New Revision: 990998
URL: http://svn.apache.org/viewvc?rev=990998&view=rev
Log:
erlang: Rename _impl headers to _behaviour
Added:
incubator/thrift/trunk/lib/erl/include/thrift_protocol_behaviour.hrl
- copied, changed from r990997, incubator/thrift/trunk/lib/erl/include/thrift_protocol_impl.hrl
incubator/thrift/trunk/lib/erl/include/thrift_transport_behaviour.hrl
- copied, changed from r990997, incubator/thrift/trunk/lib/erl/include/thrift_transport_impl.hrl
Removed:
incubator/thrift/trunk/lib/erl/include/thrift_protocol_impl.hrl
incubator/thrift/trunk/lib/erl/include/thrift_transport_impl.hrl
Modified:
incubator/thrift/trunk/lib/erl/src/thrift_base64_transport.erl
incubator/thrift/trunk/lib/erl/src/thrift_binary_protocol.erl
incubator/thrift/trunk/lib/erl/src/thrift_buffered_transport.erl
incubator/thrift/trunk/lib/erl/src/thrift_disk_log_transport.erl
incubator/thrift/trunk/lib/erl/src/thrift_file_transport.erl
incubator/thrift/trunk/lib/erl/src/thrift_framed_transport.erl
incubator/thrift/trunk/lib/erl/src/thrift_http_transport.erl
incubator/thrift/trunk/lib/erl/src/thrift_memory_buffer.erl
incubator/thrift/trunk/lib/erl/src/thrift_protocol.erl
incubator/thrift/trunk/lib/erl/src/thrift_socket_transport.erl
incubator/thrift/trunk/lib/erl/src/thrift_transport_state_test.erl
Copied: incubator/thrift/trunk/lib/erl/include/thrift_protocol_behaviour.hrl (from r990997, incubator/thrift/trunk/lib/erl/include/thrift_protocol_impl.hrl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/include/thrift_protocol_behaviour.hrl?p2=incubator/thrift/trunk/lib/erl/include/thrift_protocol_behaviour.hrl&p1=incubator/thrift/trunk/lib/erl/include/thrift_protocol_impl.hrl&r1=990997&r2=990998&rev=990998&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/include/thrift_protocol_impl.hrl (original)
+++ incubator/thrift/trunk/lib/erl/include/thrift_protocol_behaviour.hrl Mon Aug 30 22:05:55 2010
@@ -19,8 +19,8 @@
%% Signature specifications for protocol implementations.
--ifndef(THRIFT_PROTOCOL_IMPL_INCLUDED).
--define(THRIFT_PROTOCOL_IMPL_INCLUDED, true).
+-ifndef(THRIFT_PROTOCOL_BEHAVIOUR_INCLUDED).
+-define(THRIFT_PROTOCOL_BEHAVIOUR_INCLUDED, true).
-spec flush_transport(state()) -> {state(), ok | {error, _Reason}}.
-spec close_transport(state()) -> {state(), ok | {error, _Reason}}.
Copied: incubator/thrift/trunk/lib/erl/include/thrift_transport_behaviour.hrl (from r990997, incubator/thrift/trunk/lib/erl/include/thrift_transport_impl.hrl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/include/thrift_transport_behaviour.hrl?p2=incubator/thrift/trunk/lib/erl/include/thrift_transport_behaviour.hrl&p1=incubator/thrift/trunk/lib/erl/include/thrift_transport_impl.hrl&r1=990997&r2=990998&rev=990998&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/include/thrift_transport_impl.hrl (original)
+++ incubator/thrift/trunk/lib/erl/include/thrift_transport_behaviour.hrl Mon Aug 30 22:05:55 2010
@@ -19,8 +19,8 @@
%% Signature specifications for transport implementations.
--ifndef(THRIFT_TRANSPORT_IMPL_INCLUDED).
--define(THRIFT_TRANSPORT_IMPL_INCLUDED, true).
+-ifndef(THRIFT_TRANSPORT_BEHAVIOUR_INCLUDED).
+-define(THRIFT_TRANSPORT_BEHAVIOUR_INCLUDED, true).
-spec write(state(), iolist() | binary()) -> {state(), ok | {error, _Reason}}.
-spec read(state(), non_neg_integer()) -> {state(), {ok, binary()} | {error, _Reason}}.
Modified: incubator/thrift/trunk/lib/erl/src/thrift_base64_transport.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_base64_transport.erl?rev=990998&r1=990997&r2=990998&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_base64_transport.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_base64_transport.erl Mon Aug 30 22:05:55 2010
@@ -30,7 +30,7 @@
%% State
-record(b64_transport, {wrapped}).
-type state() :: #b64_transport{}.
--include("thrift_transport_impl.hrl").
+-include("thrift_transport_behaviour.hrl").
new(Wrapped) ->
State = #b64_transport{wrapped = Wrapped},
Modified: incubator/thrift/trunk/lib/erl/src/thrift_binary_protocol.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_binary_protocol.erl?rev=990998&r1=990997&r2=990998&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_binary_protocol.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_binary_protocol.erl Mon Aug 30 22:05:55 2010
@@ -38,7 +38,7 @@
strict_write=true
}).
-type state() :: #binary_protocol{}.
--include("thrift_protocol_impl.hrl").
+-include("thrift_protocol_behaviour.hrl").
-define(VERSION_MASK, 16#FFFF0000).
-define(VERSION_1, 16#80010000).
Modified: incubator/thrift/trunk/lib/erl/src/thrift_buffered_transport.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_buffered_transport.erl?rev=990998&r1=990997&r2=990998&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_buffered_transport.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_buffered_transport.erl Mon Aug 30 22:05:55 2010
@@ -31,7 +31,7 @@
write_buffer % iolist()
}).
-type state() :: #buffered_transport{}.
--include("thrift_transport_impl.hrl").
+-include("thrift_transport_behaviour.hrl").
new(WrappedTransport) ->
Modified: incubator/thrift/trunk/lib/erl/src/thrift_disk_log_transport.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_disk_log_transport.erl?rev=990998&r1=990997&r2=990998&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_disk_log_transport.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_disk_log_transport.erl Mon Aug 30 22:05:55 2010
@@ -36,7 +36,7 @@
sync_every = infinity,
sync_tref}).
-type state() :: #dl_transport{}.
--include("thrift_transport_impl.hrl").
+-include("thrift_transport_behaviour.hrl").
%% Create a transport attached to an already open log.
Modified: incubator/thrift/trunk/lib/erl/src/thrift_file_transport.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_file_transport.erl?rev=990998&r1=990997&r2=990998&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_file_transport.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_file_transport.erl Mon Aug 30 22:05:55 2010
@@ -30,7 +30,7 @@
should_close = true,
mode = write}).
-type state() :: #t_file_transport{}.
--include("thrift_transport_impl.hrl").
+-include("thrift_transport_behaviour.hrl").
%%%% CONSTRUCTION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: incubator/thrift/trunk/lib/erl/src/thrift_framed_transport.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_framed_transport.erl?rev=990998&r1=990997&r2=990998&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_framed_transport.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_framed_transport.erl Mon Aug 30 22:05:55 2010
@@ -32,7 +32,7 @@
write_buffer % iolist()
}).
-type state() :: #framed_transport{}.
--include("thrift_transport_impl.hrl").
+-include("thrift_transport_behaviour.hrl").
new(WrappedTransport) ->
State = #framed_transport{wrapped = WrappedTransport,
Modified: incubator/thrift/trunk/lib/erl/src/thrift_http_transport.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_http_transport.erl?rev=990998&r1=990997&r2=990998&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_http_transport.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_http_transport.erl Mon Aug 30 22:05:55 2010
@@ -35,7 +35,7 @@
extra_headers % [{str(), str()}, ...]
}).
-type state() :: pid().
--include("thrift_transport_impl.hrl").
+-include("thrift_transport_behaviour.hrl").
new(Host, Path) ->
new(Host, Path, _Options = []).
Modified: incubator/thrift/trunk/lib/erl/src/thrift_memory_buffer.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_memory_buffer.erl?rev=990998&r1=990997&r2=990998&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_memory_buffer.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_memory_buffer.erl Mon Aug 30 22:05:55 2010
@@ -29,7 +29,7 @@
-record(memory_buffer, {buffer}).
-type state() :: #memory_buffer{}.
--include("thrift_transport_impl.hrl").
+-include("thrift_transport_behaviour.hrl").
new() ->
State = #memory_buffer{buffer = []},
Modified: incubator/thrift/trunk/lib/erl/src/thrift_protocol.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_protocol.erl?rev=990998&r1=990997&r2=990998&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_protocol.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_protocol.erl Mon Aug 30 22:05:55 2010
@@ -117,7 +117,7 @@ read(IProto0, {struct, Structure}, Tag)
{IProto2, {ok, RTuple2}}.
-%% NOTE: Keep this in sync with thrift_protocol_impl:read
+%% NOTE: Keep this in sync with thrift_protocol_behaviour:read
-spec read
(#protocol{}, {struct, _Info}) -> {#protocol{}, {ok, tuple()} | {error, _Reason}};
(#protocol{}, tprot_cont_tag()) -> {#protocol{}, {ok, term()} | {error, _Reason}};
@@ -172,7 +172,7 @@ read(IProto0, {set, Type}) ->
read(Protocol, ProtocolType) ->
read_specific(Protocol, ProtocolType).
-%% NOTE: Keep this in sync with thrift_protocol_impl:read
+%% NOTE: Keep this in sync with thrift_protocol_behaviour:read
-spec read_specific
(#protocol{}, tprot_empty_tag()) -> {#protocol{}, ok | {error, _Reason}};
(#protocol{}, tprot_header_tag()) -> {#protocol{}, tprot_header_val() | {error, _Reason}};
Modified: incubator/thrift/trunk/lib/erl/src/thrift_socket_transport.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_socket_transport.erl?rev=990998&r1=990997&r2=990998&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_socket_transport.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_socket_transport.erl Mon Aug 30 22:05:55 2010
@@ -30,7 +30,7 @@
-record(data, {socket,
recv_timeout=infinity}).
-type state() :: #data{}.
--include("thrift_transport_impl.hrl").
+-include("thrift_transport_behaviour.hrl").
new(Socket) ->
new(Socket, []).
Modified: incubator/thrift/trunk/lib/erl/src/thrift_transport_state_test.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_transport_state_test.erl?rev=990998&r1=990997&r2=990998&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_transport_state_test.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_transport_state_test.erl Mon Aug 30 22:05:55 2010
@@ -37,7 +37,7 @@
counter :: pid()
}).
-type state() :: #trans{}.
--include("thrift_transport_impl.hrl").
+-include("thrift_transport_behaviour.hrl").
-record(state, {cversion :: integer()}).