Skip to content

Commit

Permalink
Refactor: typedef libcouchbase_cas_t for cas value
Browse files Browse the repository at this point in the history 
Change-Id: Iad6fddc771e63adabf7e35fe3c4a1c532defca51
Reviewed-on: http://review.couchbase.org/12632
Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
  • Loading branch information
@trondn
trondn committed Jan 25, 2012
1 parent cd710f2 commit fb73a70
Show file tree
Hide file tree
Showing 14 changed files with 40 additions and 38 deletions.
10 changes: 5 additions & 5 deletions include/libcouchbase/callbacks.h
View file
Expand Up @@ -37,18 +37,18 @@ extern "C" {
libcouchbase_error_t error,
const void *key, size_t nkey,
const void *bytes, size_t nbytes,
uint32_t flags, uint64_t cas);
uint32_t flags, libcouchbase_cas_t cas);
typedef void (*libcouchbase_storage_callback)(libcouchbase_t instance,
const void *cookie,
libcouchbase_storage_t operation,
libcouchbase_error_t error,
const void *key, size_t nkey,
uint64_t cas);
libcouchbase_cas_t cas);
typedef void (*libcouchbase_arithmetic_callback)(libcouchbase_t instance,
const void *cookie,
libcouchbase_error_t error,
const void *key, size_t nkey,
uint64_t value, uint64_t cas);
uint64_t value, libcouchbase_cas_t cas);
typedef void (*libcouchbase_remove_callback)(libcouchbase_t instance,
const void *cookie,
libcouchbase_error_t error,
Expand All @@ -73,15 +73,15 @@ extern "C" {
size_t nbytes,
uint32_t flags,
uint32_t exp,
uint64_t cas,
libcouchbase_cas_t cas,
uint16_t vbucket,
const void *es,
size_t nes);
typedef void (*libcouchbase_tap_deletion_callback)(libcouchbase_t instance,
const void *cookie,
const void *key,
size_t nkey,
uint64_t cas,
libcouchbase_cas_t cas,
uint16_t vbucket,
const void *es,
size_t nes);
Expand Down
8 changes: 4 additions & 4 deletions include/libcouchbase/couchbase.h
View file
Expand Up @@ -338,7 +338,7 @@ extern "C" {
const void *key, size_t nkey,
const void *bytes, size_t nbytes,
uint32_t flags, time_t exp,
uint64_t cas);
libcouchbase_cas_t cas);

/**
* Spool a store operation to the cluster. The operation <b>may</b> be
Expand Down Expand Up @@ -380,7 +380,7 @@ extern "C" {
size_t nbytes,
uint32_t flags,
time_t exp,
uint64_t cas);
libcouchbase_cas_t cas);

/**
* Spool an arithmetic operation to the cluster. The operation <b>may</b> be
Expand Down Expand Up @@ -454,7 +454,7 @@ extern "C" {
libcouchbase_error_t libcouchbase_remove(libcouchbase_t instance,
const void *command_cookie,
const void *key, size_t nkey,
uint64_t cas);
libcouchbase_cas_t cas);

/**
* Spool a remove operation to the cluster. The operation <b>may</b> be
Expand All @@ -478,7 +478,7 @@ extern "C" {
size_t nhashkey,
const void *key,
size_t nkey,
uint64_t cas);
libcouchbase_cas_t cas);


/**
Expand Down
2 changes: 2 additions & 0 deletions include/libcouchbase/types.h
View file
Expand Up @@ -276,6 +276,8 @@ extern "C" {
LIBCOUCHBASE_SYNCHRONOUS = 0xff
} libcouchbase_syncmode_t;

typedef uint64_t libcouchbase_cas_t;

#ifdef __cplusplus
}
#endif
Expand Down
10 changes: 5 additions & 5 deletions src/handler.c
View file
Expand Up @@ -558,7 +558,7 @@ static void dummy_tap_mutation_callback(libcouchbase_t instance,
size_t nbytes,
uint32_t flags,
uint32_t exp,
uint64_t cas,
libcouchbase_cas_t cas,
uint16_t vbucket,
const void *es,
size_t nes)
Expand All @@ -572,7 +572,7 @@ static void dummy_tap_deletion_callback(libcouchbase_t instance,
const void *cookie,
const void *key,
size_t nkey,
uint64_t cas,
libcouchbase_cas_t cas,
uint16_t vbucket,
const void *es,
size_t nes)
Expand Down Expand Up @@ -630,7 +630,7 @@ static void dummy_get_callback(libcouchbase_t instance,
libcouchbase_error_t error,
const void *key, size_t nkey,
const void *bytes, size_t nbytes,
uint32_t flags, uint64_t cas)
uint32_t flags, libcouchbase_cas_t cas)
{
(void)instance; (void)cookie; (void)error; (void)key; (void)nkey;
(void)bytes; (void)nbytes; (void)flags; (void)cas;
Expand All @@ -641,7 +641,7 @@ static void dummy_storage_callback(libcouchbase_t instance,
libcouchbase_storage_t operation,
libcouchbase_error_t error,
const void *key, size_t nkey,
uint64_t cas)
libcouchbase_cas_t cas)
{
(void)instance; (void)cookie; (void)operation, (void)error; (void)key;
(void)nkey; (void)cas;
Expand All @@ -651,7 +651,7 @@ static void dummy_arithmetic_callback(libcouchbase_t instance,
const void *cookie,
libcouchbase_error_t error,
const void *key, size_t nkey,
uint64_t value, uint64_t cas)
uint64_t value, libcouchbase_cas_t cas)
{
(void)instance; (void)cookie; (void)error; (void)key; (void)nkey;
(void)value; (void)cas;
Expand Down
4 changes: 2 additions & 2 deletions src/remove.c
View file
Expand Up @@ -27,7 +27,7 @@ LIBCOUCHBASE_API
libcouchbase_error_t libcouchbase_remove(libcouchbase_t instance,
const void *command_cookie,
const void *key, size_t nkey,
uint64_t cas)
libcouchbase_cas_t cas)
{
return libcouchbase_remove_by_key(instance, command_cookie, NULL, 0, key,
nkey, cas);
Expand All @@ -39,7 +39,7 @@ libcouchbase_error_t libcouchbase_remove_by_key(libcouchbase_t instance,
const void *hashkey,
size_t nhashkey,
const void *key, size_t nkey,
uint64_t cas)
libcouchbase_cas_t cas)
{
libcouchbase_server_t *server;
protocol_binary_request_delete req;
Expand Down
4 changes: 2 additions & 2 deletions src/store.c
View file
Expand Up @@ -32,7 +32,7 @@ libcouchbase_error_t libcouchbase_store(libcouchbase_t instance,
const void *key, size_t nkey,
const void *bytes, size_t nbytes,
uint32_t flags, time_t exp,
uint64_t cas)
libcouchbase_cas_t cas)
{
return libcouchbase_store_by_key(instance, command_cookie, operation, NULL, 0,
key, nkey, bytes, nbytes, flags, exp, cas);
Expand All @@ -46,7 +46,7 @@ libcouchbase_error_t libcouchbase_store_by_key(libcouchbase_t instance,
const void *key, size_t nkey,
const void *bytes, size_t nbytes,
uint32_t flags, time_t exp,
uint64_t cas)
libcouchbase_cas_t cas)
{
libcouchbase_server_t *server;
protocol_binary_request_set req;
Expand Down
4 changes: 2 additions & 2 deletions tests/arithmetic.c
View file
Expand Up @@ -31,7 +31,7 @@ static void storage_callback(libcouchbase_t instance,
libcouchbase_storage_t operation,
libcouchbase_error_t error,
const void *key, size_t nkey,
uint64_t cas)
libcouchbase_cas_t cas)
{
(void)instance; (void)operation; (void)cas; (void)cookie;
assert(nkey == 7);
Expand Down Expand Up @@ -84,7 +84,7 @@ static void arithmetic_callback(libcouchbase_t instance,
const void *cookie,
libcouchbase_error_t error,
const void *key, size_t nkey,
uint64_t value, uint64_t cas)
uint64_t value, libcouchbase_cas_t cas)
{
assert(nkey == 7);
assert(memcmp(key, "counter", 7) == 0);
Expand Down
4 changes: 2 additions & 2 deletions tests/config-test.c
View file
Expand Up @@ -55,7 +55,7 @@ static void storage_callback(libcouchbase_t instance,
libcouchbase_storage_t operation,
libcouchbase_error_t error,
const void *key, size_t nkey,
uint64_t cas)
libcouchbase_cas_t cas)
{
struct rvbuf *rv = (struct rvbuf *)cookie;
rv->error = error;
Expand All @@ -74,7 +74,7 @@ static void get_callback(libcouchbase_t instance,
libcouchbase_error_t error,
const void *key, size_t nkey,
const void *bytes, size_t nbytes,
uint32_t flags, uint64_t cas)
uint32_t flags, libcouchbase_cas_t cas)
{
struct rvbuf *rv = (struct rvbuf *)cookie;
rv->error = error;
Expand Down
10 changes: 5 additions & 5 deletions tests/double-free-test.c
View file
Expand Up @@ -32,8 +32,8 @@ struct libcouchbase_io_opt_st *io = NULL;
struct rvbuf
{
libcouchbase_error_t error;
uint64_t cas1;
uint64_t cas2;
libcouchbase_cas_t cas1;
libcouchbase_cas_t cas2;
};

static void error_callback(libcouchbase_t instance,
Expand Down Expand Up @@ -89,7 +89,7 @@ static void store_callback1(libcouchbase_t instance,
libcouchbase_storage_t operation,
libcouchbase_error_t error,
const void *key, size_t nkey,
uint64_t cas)
libcouchbase_cas_t cas)
{
struct rvbuf *rv = (struct rvbuf *)cookie;
rv->error = error;
Expand All @@ -107,7 +107,7 @@ static void store_callback2(libcouchbase_t instance,
libcouchbase_storage_t operation,
libcouchbase_error_t error,
const void *key, size_t nkey,
uint64_t cas)
libcouchbase_cas_t cas)
{
struct rvbuf *rv = (struct rvbuf *)cookie;
rv->error = error;
Expand All @@ -125,7 +125,7 @@ static void get_callback(libcouchbase_t instance,
libcouchbase_error_t error,
const void *key, size_t nkey,
const void *bytes, size_t nbytes,
uint32_t flags, uint64_t cas)
uint32_t flags, libcouchbase_cas_t cas)
{
struct rvbuf *rv = (struct rvbuf *)cookie;
const char *val = "{\"bar\"=>1, \"baz\"=>2}";
Expand Down
4 changes: 2 additions & 2 deletions tests/flags-test.c
View file
Expand Up @@ -49,7 +49,7 @@ static void storage_callback(libcouchbase_t instance,
libcouchbase_storage_t operation,
libcouchbase_error_t error,
const void *key, size_t nkey,
uint64_t cas)
libcouchbase_cas_t cas)
{
(void)instance; (void)operation; (void)cas; (void)cookie;
assert(nkey == 5);
Expand All @@ -62,7 +62,7 @@ static void get_callback(libcouchbase_t instance,
libcouchbase_error_t error,
const void *key, size_t nkey,
const void *bytes, size_t nbytes,
uint32_t flags, uint64_t cas)
uint32_t flags, libcouchbase_cas_t cas)
{
(void)instance; (void)cookie; (void)cas;
assert(nkey == 5);
Expand Down
8 changes: 4 additions & 4 deletions tests/smoke-test.c
View file
Expand Up @@ -85,7 +85,7 @@ struct rvbuf
size_t nkey;
const char *bytes;
size_t nbytes;
uint64_t cas;
libcouchbase_cas_t cas;
uint32_t flags;
int32_t counter;
uint32_t errors;
Expand All @@ -96,7 +96,7 @@ static void store_callback(libcouchbase_t instance,
libcouchbase_storage_t operation,
libcouchbase_error_t error,
const void *key, size_t nkey,
uint64_t cas)
libcouchbase_cas_t cas)
{
struct rvbuf *rv = (struct rvbuf *)cookie;
rv->error = error;
Expand All @@ -114,7 +114,7 @@ static void mstore_callback(libcouchbase_t instance,
libcouchbase_storage_t operation,
libcouchbase_error_t error,
const void *key, size_t nkey,
uint64_t cas)
libcouchbase_cas_t cas)
{
struct rvbuf *rv = (struct rvbuf *)cookie;
rv->errors |= error;
Expand All @@ -135,7 +135,7 @@ static void get_callback(libcouchbase_t instance,
libcouchbase_error_t error,
const void *key, size_t nkey,
const void *bytes, size_t nbytes,
uint32_t flags, uint64_t cas)
uint32_t flags, libcouchbase_cas_t cas)
{
struct rvbuf *rv = (struct rvbuf *)cookie;
rv->error = error;
Expand Down
2 changes: 1 addition & 1 deletion tests/timeout-test.c
View file
Expand Up @@ -55,7 +55,7 @@ static void storage_callback(libcouchbase_t instance,
libcouchbase_storage_t operation,
libcouchbase_error_t error,
const void *key, size_t nkey,
uint64_t cas)
libcouchbase_cas_t cas)
{
libcouchbase_io_opt_t *io = (libcouchbase_io_opt_t *)cookie;

Expand Down
4 changes: 2 additions & 2 deletions tools/cbc-send.cc
View file
Expand Up @@ -39,7 +39,7 @@ extern "C" {
size_t nbytes,
uint32_t flags,
uint32_t exp,
uint64_t cas,
libcouchbase_cas_t cas,
uint16_t vbucket,
const void *,
size_t)
Expand All @@ -66,7 +66,7 @@ extern "C" {
const void *,
const void *key,
size_t nkey,
uint64_t cas,
libcouchbase_cas_t cas,
uint16_t vbucket,
const void *,
size_t)
Expand Down
4 changes: 2 additions & 2 deletions tools/cbc.cc
View file
Expand Up @@ -69,7 +69,7 @@ extern "C" {
libcouchbase_storage_t,
libcouchbase_error_t error,
const void *key, size_t nkey,
uint64_t cas)
libcouchbase_cas_t cas)
{
if (error == LIBCOUCHBASE_SUCCESS) {
cerr << "Stored \"";
Expand Down Expand Up @@ -112,7 +112,7 @@ extern "C" {
libcouchbase_error_t error,
const void *key, size_t nkey,
const void *bytes, size_t nbytes,
uint32_t flags, uint64_t cas)
uint32_t flags, libcouchbase_cas_t cas)
{
if (error == LIBCOUCHBASE_SUCCESS) {
cerr << "\"";
Expand Down

0 comments on commit fb73a70

Please sign in to comment.