From 13e22e1802c866dd884a4f2941239a8233c644f0 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Tue, 1 Dec 2015 15:48:49 +0000 Subject: [PATCH] Revert "only flush to track-changes when ops are queued" This reverts commit 0baa8f989481ca263fa71e90af21f13b29c29504. --- .../document-updater/app/coffee/DocumentManager.coffee | 2 +- .../document-updater/app/coffee/RedisManager.coffee | 3 --- .../app/coffee/TrackChangesManager.coffee | 10 ---------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/services/document-updater/app/coffee/DocumentManager.coffee b/services/document-updater/app/coffee/DocumentManager.coffee index c7aa1e565a..81fa0aa66c 100644 --- a/services/document-updater/app/coffee/DocumentManager.coffee +++ b/services/document-updater/app/coffee/DocumentManager.coffee @@ -91,7 +91,7 @@ module.exports = DocumentManager = logger.log project_id: project_id, doc_id: doc_id, version: version, "flushing doc" PersistenceManager.setDoc project_id, doc_id, lines, version, (error) -> return callback(error) if error? - TrackChangesManager.flushDocChangesIfNeeded project_id, doc_id, (error) -> + TrackChangesManager.flushDocChanges project_id, doc_id, (error) -> return callback(error) if error? callback null diff --git a/services/document-updater/app/coffee/RedisManager.coffee b/services/document-updater/app/coffee/RedisManager.coffee index b0a33aa734..d280de1cea 100644 --- a/services/document-updater/app/coffee/RedisManager.coffee +++ b/services/document-updater/app/coffee/RedisManager.coffee @@ -171,9 +171,6 @@ module.exports = RedisManager = [length, _] = results callback(error, length) - getUncompressedHistoryOpLength: (doc_id, callback = (error, length) ->) -> - rclient.llen keys.uncompressedHistoryOp(doc_id: doc_id), callback - getDocOpsLength: (doc_id, callback = (error, length) ->) -> rclient.llen keys.docOps(doc_id: doc_id), callback diff --git a/services/document-updater/app/coffee/TrackChangesManager.coffee b/services/document-updater/app/coffee/TrackChangesManager.coffee index 86bb329f9b..90cba86b36 100644 --- a/services/document-updater/app/coffee/TrackChangesManager.coffee +++ b/services/document-updater/app/coffee/TrackChangesManager.coffee @@ -5,16 +5,6 @@ RedisManager = require "./RedisManager" crypto = require("crypto") module.exports = TrackChangesManager = - - flushDocChangesIfNeeded: (project_id, doc_id, callback = (error) ->) -> - RedisManager.getUncompressedHistoryOpLength doc_id, (error, length) -> - return callback(error) if error? - if length > 0 - # only make request to track changes if there are queued ops - TrackChangesManager.flushDocChanges project_id, doc_id, callback - else - callback() - flushDocChanges: (project_id, doc_id, callback = (error) ->) -> if !settings.apis?.trackchanges? logger.warn doc_id: doc_id, "track changes API is not configured, so not flushing"