Optimize snapshot size

knizhnik · knizhnik · commit 91e71d252d6c · 2015-12-27T23:09:26.000+03:00
diff --git a/contrib/multimaster/dtmd/src/main.c b/contrib/multimaster/dtmd/src/main.c
@@ -196,25 +196,19 @@ static void gen_snapshot(Snapshot *s) {
     int n = 0;
 	s->times_sent = 0;
 	for (t = (Transaction*)active_transactions.prev; t != (Transaction*)&active_transactions; t = (Transaction*)t->elem.prev) {
-        /*
-		if (t->xid < s->xmin) {
-			s->xmin = t->xid;
-		}
-		if (t->xid >= s->xmax) { 
-			s->xmax = t->xid + 1;
-		}
-        */
 		s->active[n++] = t->xid;
 	}
-    s->nactive = n;
+	while (n > 1 && s->active[n-2]+1 == s->active[n-1]) { 
+		n -= 1;
+	}
 	if (n > 0) {
         s->xmin = s->active[0];
-        s->xmax = s->active[n-1];
+        s->xmax = s->active[--n];
 		assert(s->xmin <= s->xmax);
-		// snapshot_sort(s);
 	} else {
 		s->xmin = s->xmax = 0;
 	}
+    s->nactive = n;
 }
 
 static void onreserve(client_t client, int argc, xid_t *argv) {
diff --git a/contrib/multimaster/tests/postgresql.conf.mm b/contrib/multimaster/tests/postgresql.conf.mm
@@ -547,9 +547,9 @@
 # These settings are initialized by initdb, but they can be changed.
 lc_messages = 'en_US.UTF-8'			# locale for system error message
 					# strings
-lc_monetary = 'ru_RU.UTF-8'			# locale for monetary formatting
-lc_numeric = 'ru_RU.UTF-8'			# locale for number formatting
-lc_time = 'ru_RU.UTF-8'				# locale for time formatting
+lc_monetary = 'en_US.UTF-8'			# locale for monetary formatting
+lc_numeric = 'en_US.UTF-8'			# locale for number formatting
+lc_time = 'en_US.UTF-8'				# locale for time formatting
 
 # default configuration for text search
 default_text_search_config = 'pg_catalog.english'
@@ -624,5 +624,5 @@
 
 # Add settings for extensions here
 
-multimaster.queue_size = 1073741824
-#multimaster.workers = 16
+multimaster.workers=8
+multimaster.queue_size=1073741824
diff --git a/contrib/multimaster/tests/reinit-mm.sh b/contrib/multimaster/tests/reinit-mm.sh
@@ -1,22 +1,22 @@
 n_nodes=3
-export PATH=/home/knizhnik/postgrespro/cluster_install/bin/:$PATH
+export PATH=/home/knizhnik/postgres_cluster/dist/bin/:$PATH
 ulimit -c unlimited
 pkill -9 postgres
 pkill -9 dtmd
-sleep 2
-rm -fr node? *.log dtm/*
+rm -fr node? *.log dtm
+mkdir dtm
 conn_str=""
 sep=""
 for ((i=1;i<=n_nodes;i++))
 do    
     port=$((5431+i))
-    conn_str="$conn_str${sep}replication=database dbname=postgres host=127.0.0.1 user=knizhnik port=$port sslmode=disable"
+    conn_str="$conn_str${sep}dbname=postgres host=127.0.0.1 user=knizhnik port=$port sslmode=disable"
     sep=","
     initdb node$i
 done
 
 echo Start DTM
-~/postgrespro/contrib/multimaster/dtmd/bin/dtmd -d dtm 2> dtm.log &
+~/postgres_cluster/contrib/multimaster/dtmd/bin/dtmd -d dtm 2> dtm.log &
 sleep 2
 
 echo Start nodes
@@ -32,10 +32,6 @@ done
 
 sleep 5
 echo Initialize database schema
-for ((i=1;i<=n_nodes;i++))
-do
-    port=$((5431+i))
-    psql -p $port postgres -U knizhnik -f init.sql
-done
+psql postgres -U knizhnik -f init.sql
 
 echo Done
