Merge pull request #358 from FirebasePrivate/patryk/next-cleanup

Pull firestore-counter changes from master.

Author: Patryk Lesiewicz

firestore-counter/extension.yaml

@@ -73,7 +73,7 @@ resources:
       location: ${LOCATION}
       eventTrigger:
         eventType: providers/cloud.firestore/eventTypes/document.write
-        resource: projects/${PROJECT_ID}/databases/(default)/documents/${MOD_METADATA_DOC}/workers/{workerId}
+        resource: projects/${PROJECT_ID}/databases/(default)/documents/${INTERNAL_STATE_PATH}/workers/{workerId}
 
 params:
   - param: LOCATION
@@ -101,7 +101,7 @@ params:
     default: us-central1
     required: true
 
-  - param: MOD_METADATA_DOC
+  - param: INTERNAL_STATE_PATH
     label: Document path for internal state
     description: >-
       What is the path to the document where the extension can keep its internal state?

firestore-counter/functions/lib/controller.js

@@ -89,7 +89,6 @@ class ShardedCounterController {
                     }
                 }));
                 const shutdown = () => __awaiter(this, void 0, void 0, function* () {
-                    console.log("Time's up, shutting down.");
                     console.log("Successfully ran " +
                         rounds +
                         " rounds. Aggregated " +

firestore-counter/functions/lib/index.js

@@ -39,7 +39,7 @@ const WORKERS_COLLECTION_ID = "_counter_workers_";
  * workers to do the aggregation.
  */
 exports.controller = functions.https.onRequest((req, res) => __awaiter(void 0, void 0, void 0, function* () {
-    const metadocRef = firestore.doc(process.env.MOD_METADATA_DOC);
+    const metadocRef = firestore.doc(process.env.INTERNAL_STATE_PATH);
     const controller = new controller_1.ShardedCounterController(metadocRef, SHARDS_COLLECTION_ID);
     let status = yield controller.aggregateOnce({ start: "", end: "" }, 200);
     if (status === controller_1.ControllerStatus.WORKERS_RUNNING ||
@@ -58,7 +58,7 @@ exports.controller = functions.https.onRequest((req, res) => __awaiter(void 0, v
  * resharding and to detect failed workers that need poking.
  */
 exports.worker = functions.firestore
-    .document(process.env.MOD_METADATA_DOC + WORKERS_COLLECTION_ID + "/{workerId}")
+    .document(process.env.INTERNAL_STATE_PATH + WORKERS_COLLECTION_ID + "/{workerId}")
     .onWrite((change, context) => __awaiter(void 0, void 0, void 0, function* () {
     // stop worker if document got deleted
     if (!change.after.exists)
@@ -74,7 +74,7 @@ exports.worker = functions.firestore
 exports.onWrite = functions.firestore
     .document("/{collection}/{**}/_counter_shards_/{shardId}")
     .onWrite((change, context) => __awaiter(void 0, void 0, void 0, function* () {
-    const metadocRef = firestore.doc(process.env.MOD_METADATA_DOC);
+    const metadocRef = firestore.doc(process.env.INTERNAL_STATE_PATH);
     const controller = new controller_1.ShardedCounterController(metadocRef, SHARDS_COLLECTION_ID);
     yield controller.aggregateContinuously({ start: "", end: "" }, 200, 60000);
 }));

firestore-counter/functions/lib/worker.js

@@ -118,10 +118,9 @@ class ShardedCounterWorker {
                 .then(resolve)
                 .catch(reject), WORKER_TIMEOUT_MS);
             unsubscribeMetadataListener = this.metadoc.ref.onSnapshot((snap) => {
-                console.log("metadoc update");
                 // if something's changed in the worker metadata since we were called, abort.
                 if (!snap.exists || !deepEqual(snap.data(), this.metadata)) {
-                    console.log("shutting down cause metadoc changed.");
+                    console.log("Shutting down because metadoc changed.");
                     shutdown()
                         .then(resolve)
                         .catch(reject);
@@ -283,11 +282,9 @@ function isEmptyPartial(data) {
         return false;
     if (Object.keys(data).length === 0)
         return true;
-    //console.log("Checking is empty partial: " + JSON.stringify(data));
     const update = new aggregator_1.NumericUpdate();
     data["_updates_"].forEach((u) => {
         update.mergeFrom(u["_data_"]);
     });
-    //console.log("Result: " + update.isNoop());
     return update.isNoop();
 }

firestore-counter/functions/src/controller.ts

@@ -109,7 +109,6 @@ export class ShardedCounterController {
       });
 
       const shutdown = async () => {
-        console.log("Time's up, shutting down.");
         console.log(
           "Successfully ran " +
             rounds +

firestore-counter/functions/src/index.ts

@@ -32,7 +32,7 @@ const WORKERS_COLLECTION_ID = "_counter_workers_";
  * workers to do the aggregation.
  */
 export const controller = functions.https.onRequest(async (req, res) => {
-  const metadocRef = firestore.doc(process.env.MOD_METADATA_DOC);
+  const metadocRef = firestore.doc(process.env.INTERNAL_STATE_PATH);
   const controller = new ShardedCounterController(
     metadocRef,
     SHARDS_COLLECTION_ID
@@ -58,7 +58,7 @@ export const controller = functions.https.onRequest(async (req, res) => {
  */
 export const worker = functions.firestore
   .document(
-    process.env.MOD_METADATA_DOC + WORKERS_COLLECTION_ID + "/{workerId}"
+    process.env.INTERNAL_STATE_PATH + WORKERS_COLLECTION_ID + "/{workerId}"
   )
   .onWrite(async (change, context) => {
     // stop worker if document got deleted
@@ -76,7 +76,7 @@ export const worker = functions.firestore
 export const onWrite = functions.firestore
   .document("/{collection}/{**}/_counter_shards_/{shardId}")
   .onWrite(async (change, context) => {
-    const metadocRef = firestore.doc(process.env.MOD_METADATA_DOC);
+    const metadocRef = firestore.doc(process.env.INTERNAL_STATE_PATH);
     const controller = new ShardedCounterController(
       metadocRef,
       SHARDS_COLLECTION_ID

firestore-counter/functions/src/worker.ts

@@ -138,10 +138,9 @@ export class ShardedCounterWorker {
       );
 
       unsubscribeMetadataListener = this.metadoc.ref.onSnapshot((snap) => {
-        console.log("metadoc update");
         // if something's changed in the worker metadata since we were called, abort.
         if (!snap.exists || !deepEqual(snap.data(), this.metadata)) {
-          console.log("shutting down cause metadoc changed.");
+          console.log("Shutting down because metadoc changed.");
           shutdown()
             .then(resolve)
             .catch(reject);
@@ -342,11 +341,9 @@ function isEmptyPartial(data: { [key: string]: any }): boolean {
   if (Object.keys(data).length === 1 && !("_updates_" in data)) return false;
   if (Object.keys(data).length === 0) return true;
 
-  //console.log("Checking is empty partial: " + JSON.stringify(data));
   const update = new NumericUpdate();
   data["_updates_"].forEach((u) => {
     update.mergeFrom(u["_data_"]);
   });
-  //console.log("Result: " + update.isNoop());
   return update.isNoop();
 }