ctdb-daemon: Rename struct ctdb_db_statistics to ctdb_db_statistics_old

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

6 files changed, 14 insertions, 14 deletions

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 8504673a72c..90b7891f965 100644
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -1292,12 +1292,12 @@ int ctdb_ctrl_statistics(struct ctdb_context *ctdb, uint32_t destnode, struct ct
  * get db statistics
  */
 int ctdb_ctrl_dbstatistics(struct ctdb_context *ctdb, uint32_t destnode, uint32_t dbid,
-			   TALLOC_CTX *mem_ctx, struct ctdb_db_statistics **dbstat)
+			   TALLOC_CTX *mem_ctx, struct ctdb_db_statistics_old **dbstat)
 {
 	int ret;
 	TDB_DATA indata, outdata;
 	int32_t res;
-	struct ctdb_db_statistics *wire, *s;
+	struct ctdb_db_statistics_old *wire, *s;
 	char *ptr;
 	int i;
 
@@ -1311,21 +1311,21 @@ int ctdb_ctrl_dbstatistics(struct ctdb_context *ctdb, uint32_t destnode, uint32_
 		return -1;
 	}
 
-	if (outdata.dsize < offsetof(struct ctdb_db_statistics, hot_keys_wire)) {
+	if (outdata.dsize < offsetof(struct ctdb_db_statistics_old, hot_keys_wire)) {
 		DEBUG(DEBUG_ERR,(__location__ " Wrong dbstatistics size %zi - expected >= %lu\n",
 				 outdata.dsize,
 				 (long unsigned int)sizeof(struct ctdb_statistics)));
 		return -1;
 	}
 
-	s = talloc_zero(mem_ctx, struct ctdb_db_statistics);
+	s = talloc_zero(mem_ctx, struct ctdb_db_statistics_old);
 	if (s == NULL) {
 		talloc_free(outdata.dptr);
 		CTDB_NO_MEMORY(ctdb, s);
 	}
 
-	wire = (struct ctdb_db_statistics *)outdata.dptr;
-	memcpy(s, wire, offsetof(struct ctdb_db_statistics, hot_keys_wire));
+	wire = (struct ctdb_db_statistics_old *)outdata.dptr;
+	memcpy(s, wire, offsetof(struct ctdb_db_statistics_old, hot_keys_wire));
 	ptr = &wire->hot_keys_wire[0];
 	for (i=0; i<wire->num_hot_keys; i++) {
 		s->hot_keys[i].key.dptr = talloc_size(mem_ctx, s->hot_keys[i].key.dsize);
diff --git a/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h
index b21bcee282c..6e34df0f452 100644
--- a/ctdb/include/ctdb_client.h
+++ b/ctdb/include/ctdb_client.h
@@ -146,7 +146,7 @@ int ctdb_ctrl_statistics(struct ctdb_context *ctdb, uint32_t destnode,
 			 struct ctdb_statistics *status);
 int ctdb_ctrl_dbstatistics(struct ctdb_context *ctdb, uint32_t destnode,
 			   uint32_t dbid, TALLOC_CTX *mem_ctx,
-			   struct ctdb_db_statistics **dbstat);
+			   struct ctdb_db_statistics_old **dbstat);
 
 int ctdb_ctrl_shutdown(struct ctdb_context *ctdb, struct timeval timeout,
 		       uint32_t destnode);
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 63b85eb6129..ebcac9e5b9d 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -431,7 +431,7 @@ struct ctdb_db_context {
 	struct trbt_tree *deferred_fetch;
 	struct trbt_tree *defer_dmaster;
 
-	struct ctdb_db_statistics statistics;
+	struct ctdb_db_statistics_old statistics;
 
 	struct lock_context *lock_current;
 	struct lock_context *lock_pending;
diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h
index 47c25513333..ab9678977a6 100644
--- a/ctdb/include/ctdb_protocol.h
+++ b/ctdb/include/ctdb_protocol.h
@@ -709,7 +709,7 @@ struct ctdb_statistics_list_old {
 /*
  * db statistics
  */
-struct ctdb_db_statistics {
+struct ctdb_db_statistics_old {
 	struct {
 		uint32_t num_calls;
 		uint32_t num_current;
diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c
index 43181dc2afe..585135817b2 100644
--- a/ctdb/server/ctdb_ltdb_server.c
+++ b/ctdb/server/ctdb_ltdb_server.c
@@ -1628,7 +1628,7 @@ int ctdb_set_db_sticky(struct ctdb_context *ctdb, struct ctdb_db_context *ctdb_d
 
 void ctdb_db_statistics_reset(struct ctdb_db_context *ctdb_db)
 {
-	struct ctdb_db_statistics *s = &ctdb_db->statistics;
+	struct ctdb_db_statistics_old *s = &ctdb_db->statistics;
 	int i;
 
 	for (i=0; i<MAX_HOT_KEYS; i++) {
@@ -1645,7 +1645,7 @@ int32_t ctdb_control_get_db_statistics(struct ctdb_context *ctdb,
 				TDB_DATA *outdata)
 {
 	struct ctdb_db_context *ctdb_db;
-	struct ctdb_db_statistics *stats;
+	struct ctdb_db_statistics_old *stats;
 	int i;
 	int len;
 	char *ptr;
@@ -1656,7 +1656,7 @@ int32_t ctdb_control_get_db_statistics(struct ctdb_context *ctdb,
 		return -1;
 	}
 
-	len = offsetof(struct ctdb_db_statistics, hot_keys_wire);
+	len = offsetof(struct ctdb_db_statistics_old, hot_keys_wire);
 	for (i = 0; i < MAX_HOT_KEYS; i++) {
 		len += ctdb_db->statistics.hot_keys[i].key.dsize;
 	}
@@ -1668,7 +1668,7 @@ int32_t ctdb_control_get_db_statistics(struct ctdb_context *ctdb,
 	}
 
 	memcpy(stats, &ctdb_db->statistics,
-	       offsetof(struct ctdb_db_statistics, hot_keys_wire));
+	       offsetof(struct ctdb_db_statistics_old, hot_keys_wire));
 
 	stats->num_hot_keys = MAX_HOT_KEYS;
 
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 17fc258feba..9994f84e9d4 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -733,7 +733,7 @@ static int control_stats(struct ctdb_context *ctdb, int argc, const char **argv)
 static int control_dbstatistics(struct ctdb_context *ctdb, int argc, const char **argv)
 {
 	TALLOC_CTX *tmp_ctx = talloc_new(ctdb);
-	struct ctdb_db_statistics *dbstat;
+	struct ctdb_db_statistics_old *dbstat;
 	int i;
 	uint32_t db_id;
 	int num_hot_keys;