From 1d371edfcecc0b823042b5f0c4a843c801769c82 Mon Sep 17 00:00:00 2001
From: Dmitry Simonenko <pmwkaa@gmail.com>
Date: Thu, 3 Aug 2017 17:03:37 +0300
Subject: [PATCH] odissey: make scheme version 64bit

---
 sources/config.c     | 4 ++--
 sources/config.h     | 2 +-
 sources/instance.c   | 2 +-
 sources/periodic.c   | 2 +-
 sources/pooler.c     | 2 +-
 sources/scheme.c     | 2 +-
 sources/scheme.h     | 4 ++--
 sources/scheme_mgr.h | 6 +++---
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sources/config.c b/sources/config.c
index 5b53339c..eaee4c9b 100644
--- a/sources/config.c
+++ b/sources/config.c
@@ -94,7 +94,7 @@ typedef struct
 	char        *config_file;
 	char        *data;
 	int          data_size;
-	int          version;
+	uint64_t     version;
 } od_config_t;
 
 #define od_keyword(name, token) { token, name, sizeof(name) - 1 }
@@ -911,7 +911,7 @@ od_config_parse(od_config_t *config)
 }
 
 int od_config_load(od_scheme_t *scheme, od_logger_t *logger, char *config_file,
-                   int version)
+                   uint64_t version)
 {
 	od_config_t config;
 	memset(&config, 0, sizeof(config));
diff --git a/sources/config.h b/sources/config.h
index ec6fcd2a..e90eae4a 100644
--- a/sources/config.h
+++ b/sources/config.h
@@ -7,6 +7,6 @@
  * Advanced PostgreSQL connection pooler.
 */
 
-int od_config_load(od_scheme_t*, od_logger_t*, char*, int);
+int od_config_load(od_scheme_t*, od_logger_t*, char*, uint64_t);
 
 #endif /* OD_CONFIG_H */
diff --git a/sources/instance.c b/sources/instance.c
index 714e9086..20a6321d 100644
--- a/sources/instance.c
+++ b/sources/instance.c
@@ -96,7 +96,7 @@ int od_instance_main(od_instance_t *instance, int argc, char **argv)
 	instance->config_file = argv[1];
 
 	/* read config file */
-	int scheme_version;
+	uint64_t scheme_version;
 	scheme_version = od_schememgr_version(&instance->scheme_mgr);
 
 	int rc;
diff --git a/sources/periodic.c b/sources/periodic.c
index 93d99367..6b4d8e1e 100644
--- a/sources/periodic.c
+++ b/sources/periodic.c
@@ -58,7 +58,7 @@ od_periodic_stats(od_router_t *router)
 		od_route_t *route;
 		route = od_container_of(i, od_route_t, link);
 		od_log(&instance->logger,
-		       "  [%.*s.%.*s.%d] %sclients %d, "
+		       "  [%.*s.%.*s.%" PRIu64 "] %sclients %d, "
 		       "pool_active %d, "
 		       "pool_idle %d ",
 		       route->id.database_len,
diff --git a/sources/pooler.c b/sources/pooler.c
index c715f329..53853bfb 100644
--- a/sources/pooler.c
+++ b/sources/pooler.c
@@ -225,7 +225,7 @@ od_pooler_config_import(od_pooler_t *pooler)
 
 	od_scheme_t scheme;
 	od_scheme_init(&scheme);
-	int scheme_version;
+	uint64_t scheme_version;
 	scheme_version = od_schememgr_version_next(&instance->scheme_mgr);
 	int rc;
 	rc = od_config_load(&scheme, &instance->logger, instance->config_file,
diff --git a/sources/scheme.c b/sources/scheme.c
index 80abad1f..f02756d3 100644
--- a/sources/scheme.c
+++ b/sources/scheme.c
@@ -282,7 +282,7 @@ od_schemestorage_compare(od_schemestorage_t *a, od_schemestorage_t *b)
 }
 
 od_schemeroute_t*
-od_schemeroute_add(od_scheme_t *scheme, int version)
+od_schemeroute_add(od_scheme_t *scheme, uint64_t version)
 {
 	od_schemeroute_t *route;
 	route = (od_schemeroute_t*)malloc(sizeof(*route));
diff --git a/sources/scheme.h b/sources/scheme.h
index aa20f350..48d6e0ef 100644
--- a/sources/scheme.h
+++ b/sources/scheme.h
@@ -73,7 +73,7 @@ struct od_schemeroute
 	int                 user_name_len;
 	int                 user_is_default;
 	int                 is_obsolete;
-	int                 version;
+	uint64_t            version;
 	int                 refs;
 	/* auth */
 	char               *auth;
@@ -169,7 +169,7 @@ od_schemeroute_unref(od_schemeroute_t *route)
 }
 
 od_schemeroute_t*
-od_schemeroute_add(od_scheme_t*, int);
+od_schemeroute_add(od_scheme_t*, uint64_t);
 
 void od_schemeroute_free(od_schemeroute_t*);
 
diff --git a/sources/scheme_mgr.h b/sources/scheme_mgr.h
index 38ecfcd1..769a8ee4 100644
--- a/sources/scheme_mgr.h
+++ b/sources/scheme_mgr.h
@@ -11,7 +11,7 @@ typedef struct od_schememgr od_schememgr_t;
 
 struct od_schememgr
 {
-	int version;
+	uint64_t version;
 };
 
 static inline void
@@ -20,13 +20,13 @@ od_schememgr_init(od_schememgr_t *mgr)
 	mgr->version = 0;
 }
 
-static inline int
+static inline uint64_t
 od_schememgr_version(od_schememgr_t *mgr)
 {
 	return mgr->version;
 }
 
-static inline int
+static inline uint64_t
 od_schememgr_version_next(od_schememgr_t *mgr)
 {
 	return ++mgr->version;