Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-08 05:24:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add a bunch of logging to code converting old-format chat. I've seen

Browse source 
this code fail once, can't reproduce even on the same data, so I want
this in place (debug builds only) in case it happens again.
This commit is contained in:
Eric House 2016-03-13 13:55:46 -07:00
parent d25d33689a
commit 365695423c
1 changed files with 35 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
View file

@ -1186,11 +1186,15 @@ public class DBUtils {
HistoryPair[] result = null; HistoryPair[] result = null;
String oldHistory = getChatHistoryStr( context, rowid ); String oldHistory = getChatHistoryStr( context, rowid );
if ( null != oldHistory ) { if ( null != oldHistory ) {
DbgUtils.logdf( "convertChatString(): got string: %s", oldHistory );
ArrayList<ContentValues> valuess = new ArrayList<ContentValues>(); ArrayList<ContentValues> valuess = new ArrayList<ContentValues>();
ArrayList<HistoryPair> pairs = new ArrayList<HistoryPair>(); ArrayList<HistoryPair> pairs = new ArrayList<HistoryPair>();
String localPrefix = LocUtils.getString( context, R.string.chat_local_id ); String localPrefix = LocUtils.getString( context, R.string.chat_local_id );
String rmtPrefix = LocUtils.getString( context, R.string.chat_other_id ); String rmtPrefix = LocUtils.getString( context, R.string.chat_other_id );
DbgUtils.logdf( "convertChatString(): prefixes: \"%s\" and \"%s\"", localPrefix, rmtPrefix );
String[] msgs = oldHistory.split( "\n" ); String[] msgs = oldHistory.split( "\n" );
DbgUtils.logdf( "convertChatString(): split into %d", msgs.length );
int localPlayerIndx = -1; int localPlayerIndx = -1;
int remotePlayerIndx = -1; int remotePlayerIndx = -1;
for ( int ii = playersLocal.length - 1; ii >= 0; --ii ) { for ( int ii = playersLocal.length - 1; ii >= 0; --ii ) {
@ -1201,19 +1205,24 @@ public class DBUtils {
} }
} }
for ( String msg : msgs ) { for ( String msg : msgs ) {
DbgUtils.logdf( "convertChatString(): msg: %s", msg );
int indx = -1; int indx = -1;
String prefix = null; String prefix = null;
if ( msg.startsWith( localPrefix ) ) { if ( msg.startsWith( localPrefix ) ) {
DbgUtils.logdf( "convertChatString(): msg: %s starts with %s", msg, localPrefix );
prefix = localPrefix; prefix = localPrefix;
indx = localPlayerIndx; indx = localPlayerIndx;
} else if ( msg.startsWith( rmtPrefix ) ) { } else if ( msg.startsWith( rmtPrefix ) ) {
DbgUtils.logdf( "convertChatString(): msg: %s starts with %s", msg, rmtPrefix );
prefix = rmtPrefix; prefix = rmtPrefix;
indx = remotePlayerIndx; indx = remotePlayerIndx;
} else {
DbgUtils.logdf( "convertChatString(): msg: %s starts with neither", msg );
} }
if ( -1 != indx ) { if ( -1 != indx ) {
DbgUtils.logf( "removing substring %s; was: %s", prefix, msg ); DbgUtils.logdf( "convertChatString(): removing substring %s; was: %s", prefix, msg );
msg = msg.substring( prefix.length(), msg.length() ); msg = msg.substring( prefix.length(), msg.length() );
DbgUtils.logf( "removED substring; now %s", msg ); DbgUtils.logdf( "convertChatString(): removED substring; now %s", msg );
valuess.add( cvForChat( rowid, msg, indx ) ); valuess.add( cvForChat( rowid, msg, indx ) );
HistoryPair pair = new HistoryPair(msg, indx ); HistoryPair pair = new HistoryPair(msg, indx );
@ -1223,7 +1232,7 @@ public class DBUtils {
result = pairs.toArray( new HistoryPair[pairs.size()] ); result = pairs.toArray( new HistoryPair[pairs.size()] );
appendChatHistory( context, valuess ); appendChatHistory( context, valuess );
// saveChatHistory( context, rowid, null ); // clearChatHistoryString( context, rowid );
} }
return result; return result;
} }
@ -1781,6 +1790,14 @@ public class DBUtils {
synchronized( s_dbHelper ) { synchronized( s_dbHelper ) {
SQLiteDatabase db = s_dbHelper.getWritableDatabase(); SQLiteDatabase db = s_dbHelper.getWritableDatabase();
db.delete( DBHelper.TABLE_NAME_CHAT, selection, null ); db.delete( DBHelper.TABLE_NAME_CHAT, selection, null );
// for now, remove any old-format history too. Later when it's
// removed once converted (after that process is completely
// debugged), this can be removed.
ContentValues values = new ContentValues();
values.putNull( DBHelper.CHAT_HISTORY );
updateRowImpl( db, DBHelper.TABLE_NAME_CHAT, rowid, values );
db.close(); db.close();
} }
} }
@ -2427,20 +2444,12 @@ public class DBUtils {
BuildConstants.VARIANT ); BuildConstants.VARIANT );
} }
// Chat is independent of the GameLock mechanism because it's not // private static void clearChatHistoryString( Context context, long rowid )
// touching the SNAPSHOT column. // {
private static void saveChatHistory( Context context, long rowid, // ContentValues values = new ContentValues();
String history ) // values.putNull( DBHelper.CHAT_HISTORY );
{ // updateRow( context, DBHelper.TABLE_NAME_SUM, rowid, values );
ContentValues values = new ContentValues(); // }
if ( null != history ) {
values.put( DBHelper.CHAT_HISTORY, history );
} else {
values.putNull( DBHelper.CHAT_HISTORY );
}
values.put( DBHelper.LASTPLAY_TIME, new Date().getTime() );
updateRow( context, DBHelper.TABLE_NAME_SUM, rowid, values );
}
private static void initDB( Context context ) private static void initDB( Context context )
{ {
@ -2452,16 +2461,21 @@ public class DBUtils {
} }
} }
private static int updateRowImpl( SQLiteDatabase db, String table,
long rowid, ContentValues values )
{
String selection = String.format( ROW_ID_FMT, rowid );
return db.update( table, values, selection, null );
}
private static void updateRow( Context context, String table, private static void updateRow( Context context, String table,
long rowid, ContentValues values ) long rowid, ContentValues values )
{ {
String selection = String.format( ROW_ID_FMT, rowid );
initDB( context ); initDB( context );
synchronized( s_dbHelper ) { synchronized( s_dbHelper ) {
SQLiteDatabase db = s_dbHelper.getWritableDatabase(); SQLiteDatabase db = s_dbHelper.getWritableDatabase();
int result = updateRowImpl( db, table, rowid, values );
int result = db.update( table, values, selection, null );
db.close(); db.close();
if ( 0 == result ) { if ( 0 == result ) {
DbgUtils.logf( "updateRow failed" ); DbgUtils.logf( "updateRow failed" );