Просмотр исходного кода

Revert "only flush to track-changes when ops are queued"

This reverts commit 0baa8f989481ca263fa71e90af21f13b29c29504.
Brian Gough 11 лет назад
Родитель
Сommit
13e22e1802

+ 1 - 1
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
 

+ 0 - 3
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
 

+ 0 - 10
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"