WuKongIM/WuKongIMAndroidSDK
1
0
Fork 0
mirror of https://github.com/WuKongIM/WuKongIMAndroidSDK synced 2025-06-06 17:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

update Optimize message queries

Browse Source
This commit is contained in:
SL 2023-12-07 15:31:16 +08:00
parent 65c6eeca1b
commit 9d07754e5f
7 changed files with 43 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
wkim/src/main/java/com/xinbida/wukongim/db/ChannelDBManager.java
View File

@ -209,18 +209,18 @@ public class ChannelDBManager {
* @return List<WKChannel> * @return List<WKChannel>
*/ */
public synchronized List<WKChannel> queryWithFollowAndStatus(byte channelType, int follow, int status) { public synchronized List<WKChannel> queryWithFollowAndStatus(byte channelType, int follow, int status) {
Object[] args = new Object[3]; String[] args = new String[3];
args[0] = channelType; args[0] = String.valueOf(channelType);
args[1] = follow; args[1] = String.valueOf(follow);
args[2] = status; args[2] = String.valueOf(status);
String sql = "select * from " + channel + " where " + WKDBColumns.WKChannelColumns.channel_type + "=? and " + WKDBColumns.WKChannelColumns.follow + "=? and " + WKDBColumns.WKChannelColumns.status + "=? and is_deleted=0"; String selection = WKDBColumns.WKChannelColumns.channel_type + "=? and " + WKDBColumns.WKChannelColumns.follow + "=? and " + WKDBColumns.WKChannelColumns.status + "=? and is_deleted=0";
List<WKChannel> channels = new ArrayList<>(); List<WKChannel> channels = new ArrayList<>();
if (WKIMApplication if (WKIMApplication
.getInstance() .getInstance()
.getDbHelper() != null) { .getDbHelper() != null) {
try (Cursor cursor = WKIMApplication try (Cursor cursor = WKIMApplication
.getInstance() .getInstance()
.getDbHelper().rawQuery(sql, args)) { .getDbHelper().select(channel, selection, args, null)) {
if (cursor == null) { if (cursor == null) {
return channels; return channels;
} }
@ -241,17 +241,17 @@ public class ChannelDBManager {
* @return List<WKChannel> * @return List<WKChannel>
*/ */
public synchronized List<WKChannel> queryWithStatus(byte channelType, int status) { public synchronized List<WKChannel> queryWithStatus(byte channelType, int status) {
Object[] args = new Object[2]; String[] args = new String[2];
args[0] = channelType; args[0] = String.valueOf(channelType);
args[1] = status; args[1] = String.valueOf(status);
String sql = "select * from " + channel + " where " + WKDBColumns.WKChannelColumns.channel_type + "=? and " + WKDBColumns.WKChannelColumns.status + "=?"; String selection = WKDBColumns.WKChannelColumns.channel_type + "=? and " + WKDBColumns.WKChannelColumns.status + "=?";
List<WKChannel> channels = new ArrayList<>(); List<WKChannel> channels = new ArrayList<>();
if (WKIMApplication.getInstance().getDbHelper() == null) { if (WKIMApplication.getInstance().getDbHelper() == null) {
return channels; return channels;
} }
try (Cursor cursor = WKIMApplication try (Cursor cursor = WKIMApplication
.getInstance() .getInstance()
.getDbHelper().rawQuery(sql, args)) { .getDbHelper().select(channel, selection, args, null)) {
if (cursor == null) { if (cursor == null) {
return channels; return channels;
} }
@ -343,14 +343,14 @@ public class ChannelDBManager {
} }
public synchronized List<WKChannel> queryWithChannelTypeAndFollow(byte channelType, int follow) { public synchronized List<WKChannel> queryWithChannelTypeAndFollow(byte channelType, int follow) {
Object[] args = new Object[2]; String[] args = new String[2];
args[0] = channelType; args[0] = String.valueOf(channelType);
args[1] = follow; args[1] = String.valueOf(follow);
String sql = "select * from " + channel + " where " + WKDBColumns.WKChannelColumns.channel_type + "=? and " + WKDBColumns.WKChannelColumns.follow + "=?"; String selection = WKDBColumns.WKChannelColumns.channel_type + "=? and " + WKDBColumns.WKChannelColumns.follow + "=?";
List<WKChannel> channels = new ArrayList<>(); List<WKChannel> channels = new ArrayList<>();
try (Cursor cursor = WKIMApplication try (Cursor cursor = WKIMApplication
.getInstance() .getInstance()
.getDbHelper().rawQuery(sql, args)) { .getDbHelper().select(channel, selection, args, null)) {
if (cursor == null) { if (cursor == null) {
return channels; return channels;
} }
@ -367,7 +367,7 @@ public class ChannelDBManager {
String where = WKDBColumns.WKChannelColumns.channel_id + "=? and " + WKDBColumns.WKChannelColumns.channel_type + "=?"; String where = WKDBColumns.WKChannelColumns.channel_id + "=? and " + WKDBColumns.WKChannelColumns.channel_type + "=?";
String[] whereValue = new String[2]; String[] whereValue = new String[2];
whereValue[0] = channelID; whereValue[0] = channelID;
whereValue[1] = channelType + ""; whereValue[1] = String.valueOf(channelType);
WKIMApplication.getInstance().getDbHelper() WKIMApplication.getInstance().getDbHelper()
.update(channel, updateKey, updateValue, where, whereValue); .update(channel, updateKey, updateValue, where, whereValue);
} }

23
wkim/src/main/java/com/xinbida/wukongim/db/ChannelMembersDbManager.java
View File

@ -24,7 +24,7 @@ import java.util.List;
* 频道成员数据管理 * 频道成员数据管理
*/ */
public class ChannelMembersDbManager { public class ChannelMembersDbManager {
final String channelCols = "" + channel + ".channel_remark," + channel + ".channel_name," + channel + ".avatar," + channel + ".avatar_cache_key"; final String channelCols = channel + ".channel_remark," + channel + ".channel_name," + channel + ".avatar," + channel + ".avatar_cache_key";
private ChannelMembersDbManager() { private ChannelMembersDbManager() {
} }
@ -46,7 +46,7 @@ public class ChannelMembersDbManager {
args[3] = "%" + keyword + "%"; args[3] = "%" + keyword + "%";
args[4] = "%" + keyword + "%"; args[4] = "%" + keyword + "%";
args[5] = "%" + keyword + "%"; args[5] = "%" + keyword + "%";
String sql = "select " + channelMembers + ".*," + channelCols + " from " + channelMembers + " LEFT JOIN " + channel + " on " + channelMembers + ".member_uid=" + channel + ".channel_id and " + channel + ".channel_type=1 where " + channelMembers + ".channel_id=? and " + channelMembers + ".channel_type=? and " + channelMembers + ".is_deleted=0 and " + channelMembers + ".status=1 and (member_name like ? or member_remark like ? or channel_name like ? or channel_remark like ?) order by " + channelMembers + ".role=1 desc," + channelMembers + ".role=2 desc," + channelMembers + "." + WKDBColumns.WKChannelMembersColumns.created_at + " asc limit " + queryPage + "," + size + ""; String sql = "select " + channelMembers + ".*," + channelCols + " from " + channelMembers + " LEFT JOIN " + channel + " on " + channelMembers + ".member_uid=" + channel + ".channel_id and " + channel + ".channel_type=1 where " + channelMembers + ".channel_id=? and " + channelMembers + ".channel_type=? and " + channelMembers + ".is_deleted=0 and " + channelMembers + ".status=1 and (member_name like ? or member_remark like ? or channel_name like ? or channel_remark like ?) order by " + channelMembers + ".role=1 desc," + channelMembers + ".role=2 desc," + channelMembers + "." + WKDBColumns.WKChannelMembersColumns.created_at + " asc limit " + queryPage + "," + size;
Cursor cursor = WKIMApplication Cursor cursor = WKIMApplication
.getInstance() .getInstance()
.getDbHelper().rawQuery(sql, args); .getDbHelper().rawQuery(sql, args);
@ -66,7 +66,7 @@ public class ChannelMembersDbManager {
Object[] args = new Object[2]; Object[] args = new Object[2];
args[0] = channelId; args[0] = channelId;
args[1] = channelType; args[1] = channelType;
String sql = "select " + channelMembers + ".*," + channelCols + " from " + channelMembers + " LEFT JOIN " + channel + " on " + channelMembers + ".member_uid=" + channel + ".channel_id and " + channel + ".channel_type=1 where " + channelMembers + ".channel_id=? and " + channelMembers + ".channel_type=? and " + channelMembers + ".is_deleted=0 and " + channelMembers + ".status=1 order by " + channelMembers + ".role=1 desc," + channelMembers + ".role=2 desc," + channelMembers + "." + WKDBColumns.WKChannelMembersColumns.created_at + " asc limit " + queryPage + "," + size + ""; String sql = "select " + channelMembers + ".*," + channelCols + " from " + channelMembers + " LEFT JOIN " + channel + " on " + channelMembers + ".member_uid=" + channel + ".channel_id and " + channel + ".channel_type=1 where " + channelMembers + ".channel_id=? and " + channelMembers + ".channel_type=? and " + channelMembers + ".is_deleted=0 and " + channelMembers + ".status=1 order by " + channelMembers + ".role=1 desc," + channelMembers + ".role=2 desc," + channelMembers + "." + WKDBColumns.WKChannelMembersColumns.created_at + " asc limit " + queryPage + "," + size;
Cursor cursor = WKIMApplication Cursor cursor = WKIMApplication
.getInstance() .getInstance()
.getDbHelper().rawQuery(sql, args); .getDbHelper().rawQuery(sql, args);
@ -336,7 +336,7 @@ public class ChannelMembersDbManager {
String where = WKDBColumns.WKChannelMembersColumns.channel_id + "=? and " + WKDBColumns.WKChannelMembersColumns.channel_type + "=? and " + WKDBColumns.WKChannelMembersColumns.member_uid + "=?"; String where = WKDBColumns.WKChannelMembersColumns.channel_id + "=? and " + WKDBColumns.WKChannelMembersColumns.channel_type + "=? and " + WKDBColumns.WKChannelMembersColumns.member_uid + "=?";
String[] whereValue = new String[3]; String[] whereValue = new String[3];
whereValue[0] = channelID; whereValue[0] = channelID;
whereValue[1] = channelType + ""; whereValue[1] = String.valueOf(channelType);
whereValue[2] = uid; whereValue[2] = uid;
int row = WKIMApplication.getInstance().getDbHelper() int row = WKIMApplication.getInstance().getDbHelper()
.update(channelMembers, updateKey, updateValue, where, whereValue); .update(channelMembers, updateKey, updateValue, where, whereValue);
@ -428,13 +428,10 @@ public class ChannelMembersDbManager {
} }
public synchronized List<WKChannelMember> queryRobotMembers(String channelId, byte channelType) { public synchronized List<WKChannelMember> queryRobotMembers(String channelId, byte channelType) {
Object[] args = new Object[2]; String selection = "channel_id=? and channel_type=? and robot=1 and is_deleted=0";
args[0] = channelId;
args[1] = channelType;
String sql = "select * from " + channelMembers + " where channel_id=? and channel_type=? and robot=1 and is_deleted=0";
Cursor cursor = WKIMApplication Cursor cursor = WKIMApplication
.getInstance() .getInstance()
.getDbHelper().rawQuery(sql, args); .getDbHelper().select(channelMembers, selection, new String[]{channelId, String.valueOf(channelType)}, null);
List<WKChannelMember> list = new ArrayList<>(); List<WKChannelMember> list = new ArrayList<>();
if (cursor == null) { if (cursor == null) {
return list; return list;
@ -447,14 +444,10 @@ public class ChannelMembersDbManager {
} }
public List<WKChannelMember> queryWithRole(String channelId, byte channelType, int role) { public List<WKChannelMember> queryWithRole(String channelId, byte channelType, int role) {
Object[] args = new Object[3]; String selection = "channel_id=? AND channel_type=? AND role=? AND is_deleted=0";
args[0] = channelId;
args[1] = channelType;
args[2] = role;
String sql = "SELECT * FROM " + channelMembers + " WHERE channel_id=? AND channel_type=? AND role=? AND is_deleted=0";
Cursor cursor = WKIMApplication Cursor cursor = WKIMApplication
.getInstance() .getInstance()
.getDbHelper().rawQuery(sql, args); .getDbHelper().select(channelMembers, selection, new String[]{channelId, String.valueOf(channelType), String.valueOf(role)}, null);
List<WKChannelMember> list = new ArrayList<>(); List<WKChannelMember> list = new ArrayList<>();
if (cursor == null) { if (cursor == null) {
return list; return list;

9
wkim/src/main/java/com/xinbida/wukongim/db/ConversationDbManager.java
View File

@ -116,12 +116,11 @@ public class ConversationDbManager {
} }
public List<WKConversationMsg> queryWithChannelType(byte channelType) { public List<WKConversationMsg> queryWithChannelType(byte channelType) {
String sql = "select * from " + conversation + " where channel_type=?";
List<WKConversationMsg> list = new ArrayList<>(); List<WKConversationMsg> list = new ArrayList<>();
try (Cursor cursor = WKIMApplication try (Cursor cursor = WKIMApplication
.getInstance() .getInstance()
.getDbHelper() .getDbHelper()
.rawQuery(sql, new Object[]{channelType})) { .select(conversation, "channel_type=?", new String[]{String.valueOf(channelType)}, null)) {
if (cursor == null) { if (cursor == null) {
return list; return list;
} }
@ -326,7 +325,7 @@ public class ConversationDbManager {
private synchronized WKConversationMsg queryWithChannelId(String channelId, byte channelType) { private synchronized WKConversationMsg queryWithChannelId(String channelId, byte channelType) {
WKConversationMsg msg = null; WKConversationMsg msg = null;
String selection = WKDBColumns.WKCoverMessageColumns.channel_id + " = ? and " + WKDBColumns.WKCoverMessageColumns.channel_type + "=?"; String selection = WKDBColumns.WKCoverMessageColumns.channel_id + " = ? and " + WKDBColumns.WKCoverMessageColumns.channel_type + "=?";
String[] selectionArgs = new String[]{channelId, channelType + ""}; String[] selectionArgs = new String[]{channelId, String.valueOf(channelType)};
Cursor cursor = WKIMApplication Cursor cursor = WKIMApplication
.getInstance() .getInstance()
.getDbHelper() .getDbHelper()
@ -349,10 +348,10 @@ public class ConversationDbManager {
public WKConversationMsgExtra queryMsgExtraWithChannel(String channelID, byte channelType) { public WKConversationMsgExtra queryMsgExtraWithChannel(String channelID, byte channelType) {
WKConversationMsgExtra msgExtra = null; WKConversationMsgExtra msgExtra = null;
String sql = "select * from " + conversationExtra + " where channel_id=? and channel_type=?"; String selection = "channel_id=? and channel_type=?";
Cursor cursor = WKIMApplication Cursor cursor = WKIMApplication
.getInstance() .getInstance()
.getDbHelper().rawQuery(sql, new Object[]{channelID, channelType}); .getDbHelper().select(conversationExtra, selection, new String[]{channelID, String.valueOf(channelType)}, null);
if (cursor != null) { if (cursor != null) {
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
msgExtra = serializeMsgExtra(cursor); msgExtra = serializeMsgExtra(cursor);

28
wkim/src/main/java/com/xinbida/wukongim/db/MsgDbManager.java
View File

@ -416,12 +416,10 @@ public class MsgDbManager {
args[3] = oldestOrderSeq; args[3] = oldestOrderSeq;
sql = "SELECT * FROM (SELECT " + messageCols + "," + extraCols + " FROM " + message + " LEFT JOIN " + messageExtra + " on " + message + ".message_id=" + messageExtra + ".message_id WHERE " + message + ".channel_id=? and " + message + ".channel_type=? and from_uid=? and " + message + ".type<>0 and " + message + ".type<>99 AND " + message + ".order_seq<?) where is_deleted=0 and revoke=0 order by order_seq desc limit 0," + limit; sql = "SELECT * FROM (SELECT " + messageCols + "," + extraCols + " FROM " + message + " LEFT JOIN " + messageExtra + " on " + message + ".message_id=" + messageExtra + ".message_id WHERE " + message + ".channel_id=? and " + message + ".channel_type=? and from_uid=? and " + message + ".type<>0 and " + message + ".type<>99 AND " + message + ".order_seq<?) where is_deleted=0 and revoke=0 order by order_seq desc limit 0," + limit;
} }
List<WKMsg> wkMsgs = new ArrayList<>(); List<WKMsg> wkMsgList = new ArrayList<>();
Cursor cursor = null; try (Cursor cursor = WKIMApplication.getInstance().getDbHelper().rawQuery(sql, args)) {
try {
cursor = WKIMApplication.getInstance().getDbHelper().rawQuery(sql, args);
if (cursor == null) { if (cursor == null) {
return wkMsgs; return wkMsgList;
} }
WKChannel wkChannel = ChannelDBManager.getInstance().query(channelID, channelType); WKChannel wkChannel = ChannelDBManager.getInstance().query(channelID, channelType);
for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
@ -432,12 +430,10 @@ public class MsgDbManager {
WKChannelMember member = ChannelMembersDbManager.getInstance().query(channelID, WKChannelType.GROUP, wkMsg.fromUID); WKChannelMember member = ChannelMembersDbManager.getInstance().query(channelID, WKChannelType.GROUP, wkMsg.fromUID);
wkMsg.setMemberOfFrom(member); wkMsg.setMemberOfFrom(member);
} }
wkMsgs.add(wkMsg); wkMsgList.add(wkMsg);
} }
} finally {
if (cursor != null) cursor.close();
} }
return wkMsgs; return wkMsgList;
} }
public long queryOrderSeq(String channelID, byte channelType, long maxOrderSeq, int limit) { public long queryOrderSeq(String channelID, byte channelType, long maxOrderSeq, int limit) {
@ -699,7 +695,7 @@ public class MsgDbManager {
updateValue[0] = msg.content; updateValue[0] = msg.content;
updateKey[1] = WKDBColumns.WKMessageColumns.status; updateKey[1] = WKDBColumns.WKMessageColumns.status;
updateValue[1] = msg.status + ""; updateValue[1] = String.valueOf(msg.status);
updateKey[2] = WKDBColumns.WKMessageColumns.message_id; updateKey[2] = WKDBColumns.WKMessageColumns.message_id;
updateValue[2] = msg.messageID; updateValue[2] = msg.messageID;
@ -748,10 +744,9 @@ public class MsgDbManager {
public WKMsg queryWithClientSeq(long clientSeq) { public WKMsg queryWithClientSeq(long clientSeq) {
WKMsg msg = null; WKMsg msg = null;
String sql = "select * from " + message + " where " + WKDBColumns.WKMessageColumns.client_seq + "=?";
try (Cursor cursor = WKIMApplication try (Cursor cursor = WKIMApplication
.getInstance() .getInstance()
.getDbHelper().rawQuery(sql, new Object[]{clientSeq})) { .getDbHelper().select(message, "client_seq=?", new String[]{String.valueOf(clientSeq)}, null)) {
if (cursor == null) { if (cursor == null) {
return null; return null;
} }
@ -1101,7 +1096,7 @@ public class MsgDbManager {
String whereStr = ""; String whereStr = "";
for (int contentType : contentTypes) { for (int contentType : contentTypes) {
if (TextUtils.isEmpty(whereStr)) { if (TextUtils.isEmpty(whereStr)) {
whereStr = contentType + ""; whereStr = String.valueOf(contentType);
} else { } else {
whereStr = "," + contentType; whereStr = "," + contentType;
} }
@ -1466,11 +1461,11 @@ public class MsgDbManager {
String[] updateKey = new String[1]; String[] updateKey = new String[1];
String[] updateValue = new String[1]; String[] updateValue = new String[1];
updateKey[0] = WKDBColumns.WKMessageColumns.status; updateKey[0] = WKDBColumns.WKMessageColumns.status;
updateValue[0] = status + ""; updateValue[0] = String.valueOf(status);
String where = WKDBColumns.WKMessageColumns.client_seq + "=?"; String where = WKDBColumns.WKMessageColumns.client_seq + "=?";
String[] whereValue = new String[1]; String[] whereValue = new String[1];
whereValue[0] = client_seq + ""; whereValue[0] = String.valueOf(client_seq);
int row = WKIMApplication.getInstance().getDbHelper() int row = WKIMApplication.getInstance().getDbHelper()
.update(message, updateKey, updateValue, where, whereValue); .update(message, updateKey, updateValue, where, whereValue);
@ -1520,14 +1515,13 @@ public class MsgDbManager {
} }
public WKMsgExtra queryMsgExtraWithMsgID(String msgID) { public WKMsgExtra queryMsgExtraWithMsgID(String msgID) {
String sql = "select * from " + messageExtra + " where message_id=?";
WKMsgExtra extra = null; WKMsgExtra extra = null;
try { try {
if (WKIMApplication.getInstance().getDbHelper() != null) { if (WKIMApplication.getInstance().getDbHelper() != null) {
Cursor cursor = WKIMApplication Cursor cursor = WKIMApplication
.getInstance() .getInstance()
.getDbHelper() .getDbHelper()
.rawQuery(sql, new Object[]{msgID}); .select(messageExtra, "message_id=?", new String[]{msgID}, null);
if (cursor != null) { if (cursor != null) {
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
extra = serializeMsgExtra(cursor); extra = serializeMsgExtra(cursor);

6
wkim/src/main/java/com/xinbida/wukongim/db/MsgReactionDBManager.java
View File

@ -9,8 +9,8 @@ import android.text.TextUtils;
import com.xinbida.wukongim.WKIM; import com.xinbida.wukongim.WKIM;
import com.xinbida.wukongim.WKIMApplication; import com.xinbida.wukongim.WKIMApplication;
import com.xinbida.wukongim.entity.WKChannel; import com.xinbida.wukongim.entity.WKChannel;
import com.xinbida.wukongim.entity.WKMsgReaction;
import com.xinbida.wukongim.entity.WKChannelType; import com.xinbida.wukongim.entity.WKChannelType;
import com.xinbida.wukongim.entity.WKMsgReaction;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -67,11 +67,9 @@ class MsgReactionDBManager {
private boolean isExist(String uid, String messageID) { private boolean isExist(String uid, String messageID) {
boolean isExist = false; boolean isExist = false;
String sql = "select * from " + messageReaction
+ " where message_id=? and uid=?";
try (Cursor cursor = WKIMApplication try (Cursor cursor = WKIMApplication
.getInstance() .getInstance()
.getDbHelper().rawQuery(sql, new Object[]{messageID, uid})) { .getDbHelper().select(messageReaction, "message_id=? and uid=?", new String[]{messageID, uid}, null)) {
if (cursor != null && cursor.moveToLast()) { if (cursor != null && cursor.moveToLast()) {
isExist = true; isExist = true;
} }

4
wkim/src/main/java/com/xinbida/wukongim/db/RobotDBManager.java
View File

@ -194,9 +194,7 @@ public class RobotDBManager {
public List<WKRobotMenu> queryRobotMenus(String robotID) { public List<WKRobotMenu> queryRobotMenus(String robotID) {
List<WKRobotMenu> list = new ArrayList<>(); List<WKRobotMenu> list = new ArrayList<>();
String sql = "select * from " + robotMenu + " where robot_id =?"; try (Cursor cursor = WKIMApplication.getInstance().getDbHelper().select(robotMenu, "robot_id=?", new String[]{robotID}, null)) {
try (Cursor cursor = WKIMApplication.getInstance().getDbHelper().rawQuery(sql, new Object[]{robotID})) {
if (cursor == null) { if (cursor == null) {
return list; return list;
} }

4
wkim/src/main/java/com/xinbida/wukongim/db/WKCursor.java
View File

@ -56,8 +56,4 @@ public class WKCursor {
} }
return placeholders.toString(); return placeholders.toString();
} }
public static void copyArray(String[] src, String[] dest) {
System.arraycopy(src, 0, dest, 0, src.length);
}
} }