Merge pull request #90 from qeled/indev-speed

Improve Cache class performance
This commit is contained in:
Amish Shah
2015-12-10 17:38:27 +00:00
3 changed files with 20 additions and 44 deletions

View File

@@ -1076,11 +1076,6 @@ export default class InternalClient {
var startTime = Date.now(); var startTime = Date.now();
self.intervals.kai = setInterval(() => self.sendWS({ op: 1, d: Date.now() }), data.heartbeat_interval); self.intervals.kai = setInterval(() => self.sendWS({ op: 1, d: Date.now() }), data.heartbeat_interval);
self.users.setHighPerformance();
self.servers.setHighPerformance();
self.channels.setHighPerformance();
self.private_channels.setHighPerformance();
self.user = self.users.add(new User(data.user, client)); self.user = self.users.add(new User(data.user, client));
data.guilds.forEach(server => { data.guilds.forEach(server => {
self.servers.add(new Server(server, client)); self.servers.add(new Server(server, client));
@@ -1090,11 +1085,6 @@ export default class InternalClient {
}); });
self.state = ConnectionState.READY; self.state = ConnectionState.READY;
self.users.setNormalPerformance();
self.servers.setNormalPerformance();
self.channels.setNormalPerformance();
self.private_channels.setNormalPerformance();
client.emit("ready"); client.emit("ready");
client.emit("debug", `ready packet took ${Date.now() - startTime}ms to process`); client.emit("debug", `ready packet took ${Date.now() - startTime}ms to process`);
client.emit("debug", `ready with ${self.servers.length} servers, ${self.channels.length} channels and ${self.users.length} users cached.`); client.emit("debug", `ready with ${self.servers.length} servers, ${self.channels.length} channels and ${self.users.length} users cached.`);

View File

@@ -33,8 +33,6 @@ export default class Server extends Equality {
this.afkChannelID = data.afk_channel_id; this.afkChannelID = data.afk_channel_id;
this.memberMap = {}; this.memberMap = {};
this.members.setHighPerformance();
var self = this; var self = this;
data.roles.forEach((dataRole) => { data.roles.forEach((dataRole) => {
@@ -71,8 +69,6 @@ export default class Server extends Equality {
} }
} }
} }
this.members.setNormalPerformance();
} }
detailsOf(user) { detailsOf(user) {

View File

@@ -4,28 +4,18 @@ export default class Cache extends Array {
constructor(discrim, limit) { constructor(discrim, limit) {
super(); super();
this.discrim = discrim || "id"; this.discrim = discrim || "id";
this.discrimCache = []; this.discrimCache = {};
this.highPerformance = false;
}
setHighPerformance() {
this.highPerformance = true;
}
setNormalPerformance() {
this.discrimCache = [];
this.highPerformance = false;
} }
get(key, value) { get(key, value) {
var found = null; if (key === this.discrim)
this.forEach((val, index, array) => { return this.discrimCache[value] || null;
if (val[key] == value) {
found = val; var l = this.length;
return; for (var i = 0; i < l; i++)
} if (this[i][key] == value)
}); return this[i];
return found; return null;
} }
has(object) { has(object) {
@@ -44,18 +34,16 @@ export default class Cache extends Array {
} }
add(data) { add(data) {
var exit = false; var cacheKey = this.discrim === "id" ? data.id : data[this.discrim];
exit = ~this.discrimCache.indexOf(data[this.discrim]); if (this.discrimCache[cacheKey]) {
if (exit) { return this.discrimCache[cacheKey];
return data;
} else {
if (this.limit && this.length >= this.limit) {
this.splice(0, 1);
}
this.push(data);
this.discrimCache.push(data[this.discrim]);
return data;
} }
if (this.limit && this.length >= this.limit) {
this.splice(0, 1);
}
this.push(data);
this.discrimCache[cacheKey] = data;
return data;
} }
update(old, data) { update(old, data) {
@@ -63,6 +51,7 @@ export default class Cache extends Array {
if (item) { if (item) {
var index = this.indexOf(item); var index = this.indexOf(item);
this[index] = data; this[index] = data;
this.discrimCache[data[this.discrim]] = data;
return this[index]; return this[index];
} else { } else {
return false; return false;
@@ -74,6 +63,7 @@ export default class Cache extends Array {
} }
remove(data) { remove(data) {
delete this.discrimCache[data[this.discrim]];
var index = this.indexOf(data); var index = this.indexOf(data);
if (~index) { if (~index) {
this.splice(index, 1); this.splice(index, 1);