Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-16 15:41:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

add, but disable with compile flags, ability to mark sent messages

Browse source 
with a timestamp rather than delete them.  Plan is to experiement with
this as a way of keeping devices from sending too many identical
messages when GCM's in use -- since constraints on the msgs table will
not allow identical messages to be added.
This commit is contained in:
Eric House 2012-11-15 06:25:22 -08:00
parent 4dbc76006c
commit 694857dd4e
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/relay/Makefile
View file

@ -45,6 +45,7 @@ CPPFLAGS += -DSPAWN_SELF -g -Wall \
-I $(shell pg_config --includedir) \
-DSVN_REV=\"$(shell cat $(GITINFO) 2>/dev/null || echo -n $(HASH) )\"
# CPPFLAGS += -DDO_HTTP
# CPPFLAGS += -DHAVE_SENDTIME
# turn on semaphore debugging
# CPPFLAGS += -DDEBUG_LOCKS

23
xwords4/relay/dbmgr.cpp
View file

@ -580,7 +580,11 @@ DBMgr::PendingMsgCount( const char* connName, int hid )
{
int count = 0;
const char* fmt = "SELECT COUNT(*) FROM " MSGS_TABLE
" WHERE connName = '%s' AND hid = %d ";
" WHERE connName = '%s' AND hid = %d "
#ifdef HAVE_SENDTIME
"AND sendtime IS NULL"
#endif
;
string query;
string_printf( query, fmt, connName, hid );
logf( XW_LOGINFO, "%s: query: %s", __func__, query.c_str() );
@ -687,7 +691,11 @@ int
DBMgr::CountStoredMessages( const char* const connName, int hid )
{
const char* fmt = "SELECT count(*) FROM " MSGS_TABLE
" WHERE connname = '%s' ";
" WHERE connname = '%s' "
#ifdef HAVE_SENDTIME
"AND sendtime IS NULL"
#endif
;
string query;
string_printf( query, fmt, connName );
@ -740,6 +748,9 @@ DBMgr::GetNthStoredMessage( const char* const connName, int hid,
{
const char* fmt = "SELECT id, msg, msglen FROM " MSGS_TABLE
" WHERE connName = '%s' AND hid = %d "
#ifdef HAVE_SENDTIME
"AND sendtime IS NULL "
#endif
"ORDER BY id LIMIT 1 OFFSET %d";
string query;
string_printf( query, fmt, connName, hid, nn );
@ -795,7 +806,13 @@ DBMgr::RemoveStoredMessages( const int* msgIDs, int nMsgIDs )
}
}
const char* fmt = "DELETE from " MSGS_TABLE " WHERE id in (%s)";
const char* fmt =
#ifdef HAVE_SENDTIME
"UPDATE " MSGS_TABLE " SET sendtime='now' "
#else
"DELETE FROM " MSGS_TABLE
#endif
" WHERE id IN (%s)";
string query;
string_printf( query, fmt, ids.c_str() );
logf( XW_LOGINFO, "%s: query: %s", __func__, query.c_str() );