Make tests less noisy, maintain preds list

Paul Korzhyk · Paul Korzhyk · commit b14381cb9a21 · 2019-02-12T16:50:46.000+02:00
diff --git a/lib/clientStub.js b/lib/clientStub.js
@@ -35,7 +35,7 @@ var DgraphClientStub = (function () {
         if (req.vars != null) {
             headers["X-Dgraph-Vars"] = JSON.stringify(req.vars);
         }
-        return this.callAPI("query" + (req.startTs == null ? "" : "/" + req.startTs), {
+        return this.callAPI("query" + (req.startTs === 0 ? "" : "/" + req.startTs), {
             method: "POST",
             body: req.query,
             headers: headers,
@@ -56,7 +56,7 @@ var DgraphClientStub = (function () {
             body = JSON.stringify(obj);
         }
         else if (mu.setNquads != null || mu.deleteNquads != null) {
-            body = "{\n                " + (mu.setNquads == null ? "" : "set {\n                    " + mu.setNquads + "\n                }") + "\n                " + (mu.deleteNquads == null ? "" : "delete {\n                    " + mu.deleteNquads + "\n                }") + "\n            }";
+            body = "{\n                " + (mu.setNquads === undefined ? "" : "set {\n                    " + mu.setNquads + "\n                }") + "\n                " + (mu.deleteNquads === undefined ? "" : "delete {\n                    " + mu.deleteNquads + "\n                }") + "\n            }";
         }
         else {
             return Promise.reject("Mutation mu argument in alter");
@@ -68,7 +68,7 @@ var DgraphClientStub = (function () {
         if (mu.commitNow) {
             headers["X-Dgraph-CommitNow"] = "true";
         }
-        return this.callAPI("mutate" + (mu.startTs == null ? "" : "/" + mu.startTs), {
+        return this.callAPI("mutate" + (mu.startTs === 0 ? "" : "/" + mu.startTs), {
             method: "POST",
             body: body,
             headers: headers,
diff --git a/lib/txn.d.ts b/lib/txn.d.ts
@@ -13,5 +13,6 @@ export declare class Txn {
     mutate(mu: Mutation): Promise<Assigned>;
     commit(): Promise<void>;
     discard(): Promise<void>;
+    private mergeArrays;
     private mergeContext;
 }
diff --git a/lib/txn.js b/lib/txn.js
@@ -42,7 +42,11 @@ var Txn = (function () {
         this.finished = false;
         this.mutated = false;
         this.dc = dc;
-        this.ctx = { start_ts: 0 };
+        this.ctx = {
+            start_ts: 0,
+            keys: [],
+            preds: [],
+        };
     }
     Txn.prototype.query = function (q) {
         return this.queryWithVars(q, null);
@@ -180,8 +184,13 @@ var Txn = (function () {
             });
         });
     };
+    Txn.prototype.mergeArrays = function (a, b) {
+        var res = a.slice();
+        res.push.apply(res, b);
+        res.sort();
+        return res.filter(function (item, idx, arr) { return idx === 0 || arr[idx - 1] !== item; });
+    };
     Txn.prototype.mergeContext = function (src) {
-        var _a;
         if (src == null) {
             return;
         }
@@ -191,13 +200,11 @@ var Txn = (function () {
         else if (this.ctx.start_ts !== src.start_ts) {
             throw new Error("StartTs mismatch");
         }
-        if (src.keys != null) {
-            if (this.ctx.keys == null) {
-                this.ctx.keys = src.keys;
-            }
-            else {
-                (_a = this.ctx.keys).push.apply(_a, src.keys);
-            }
+        if (src.keys !== null) {
+            this.ctx.keys = this.mergeArrays(this.ctx.keys, src.keys);
+        }
+        if (src.preds !== null) {
+            this.ctx.preds = this.mergeArrays(this.ctx.preds, src.preds);
         }
     };
     return Txn;
diff --git a/lib/types.d.ts b/lib/types.d.ts
@@ -11,7 +11,7 @@ export interface Request {
     vars?: {
         [k: string]: string;
     } | null;
-    startTs?: number | null;
+    startTs?: number;
 }
 export interface Response {
     data: {};
@@ -22,7 +22,7 @@ export interface Mutation {
     deleteJson?: object | null;
     setNquads?: string | null;
     deleteNquads?: string | null;
-    startTs?: number | null;
+    startTs?: number;
     commitNow?: boolean | null;
 }
 export interface Assigned {
@@ -40,9 +40,9 @@ export interface Extensions {
 }
 export interface TxnContext {
     start_ts: number;
-    commit_ts?: number | null;
     aborted?: boolean | null;
     keys?: string[] | null;
+    preds?: string[] | null;
 }
 export interface Latency {
     parsing_ns?: number | null;
diff --git a/src/clientStub.ts b/src/clientStub.ts
@@ -50,7 +50,7 @@ export class DgraphClientStub {
             headers["X-Dgraph-Vars"] = JSON.stringify(req.vars);
         }
 
-        return this.callAPI(`query${req.startTs == null ? "" : `/${req.startTs}`}`, {
+        return this.callAPI(`query${req.startTs === 0 ? "" : `/${req.startTs}`}`, {
             method: "POST",
             body: req.query,
             headers,
@@ -73,10 +73,10 @@ export class DgraphClientStub {
             body = JSON.stringify(obj);
         } else if (mu.setNquads != null || mu.deleteNquads != null) {
             body = `{
-                ${mu.setNquads == null ? "" : `set {
+                ${mu.setNquads === undefined ? "" : `set {
                     ${mu.setNquads}
                 }`}
-                ${mu.deleteNquads == null ? "" : `delete {
+                ${mu.deleteNquads === undefined ? "" : `delete {
                     ${mu.deleteNquads}
                 }`}
             }`;
@@ -92,7 +92,7 @@ export class DgraphClientStub {
             headers["X-Dgraph-CommitNow"] = "true";
         }
 
-        return this.callAPI(`mutate${mu.startTs == null ? "" : `/${mu.startTs}`}`, {
+        return this.callAPI(`mutate${mu.startTs === 0 ? "" : `/${mu.startTs}`}`, {
             method: "POST",
             body,
             headers,
diff --git a/src/txn.ts b/src/txn.ts
@@ -29,7 +29,11 @@ export class Txn {
 
     constructor(dc: DgraphClient) {
         this.dc = dc;
-        this.ctx = { start_ts: 0 };
+        this.ctx = {
+          start_ts: 0,
+          keys: [],
+          preds: [],
+        };
     }
 
     /**
@@ -184,6 +188,15 @@ export class Txn {
         await c.abort(this.ctx);
     }
 
+    private mergeArrays(a: string[], b: string[]) {
+        const res = a.slice();
+        res.push(...b);
+        res.sort();
+        // Filter unique in a sorted array.
+        return res.filter(
+            (item: string, idx: number, arr: string[]) => idx === 0 || arr[idx - 1] !== item);
+    }
+
     private mergeContext(src?: TxnContext | null): void {
         if (src == null) {
             // This condition will be true only if the server doesn't return a txn context after a query or mutation.
@@ -197,12 +210,11 @@ export class Txn {
             throw new Error("StartTs mismatch");
         }
 
-        if (src.keys != null) {
-            if (this.ctx.keys == null) {
-                this.ctx.keys = src.keys;
-            } else {
-                this.ctx.keys.push(...src.keys);
-            }
+        if (src.keys !== null) {
+            this.ctx.keys = this.mergeArrays(this.ctx.keys, src.keys);
+        }
+        if (src.preds !== null) {
+            this.ctx.preds = this.mergeArrays(this.ctx.preds, src.preds);
         }
     }
 }
diff --git a/src/types.ts b/src/types.ts
@@ -11,7 +11,7 @@ export interface Payload {
 export interface Request {
     query: string;
     vars?: { [k: string]: string } | null;
-    startTs?: number | null;
+    startTs?: number;
 }
 
 export interface Response {
@@ -24,7 +24,7 @@ export interface Mutation {
     deleteJson?: object | null;
     setNquads?: string | null;
     deleteNquads?: string | null;
-    startTs?: number | null;
+    startTs?: number;
     commitNow?: boolean | null;
 }
 
@@ -44,9 +44,9 @@ export interface Extensions {
 
 export interface TxnContext {
     start_ts: number;
-    commit_ts?: number | null;
     aborted?: boolean | null;
     keys?: string[] | null;
+    preds?: string[] | null;
 }
 
 export interface Latency {
diff --git a/tests/integration/acctUpsert.spec.ts b/tests/integration/acctUpsert.spec.ts
@@ -67,7 +67,7 @@ async function tryUpsert(account: Account): Promise<void> {
     }
 }
 
-let startStatus = 0; // set at the start of doUpserts
+let startTime = 0; // set at the start of doUpserts
 let lastStatus = 0;
 let cancelled = false; // cancelled due to timeout
 
@@ -76,9 +76,9 @@ let retryCount = 0;
 
 function conditionalLog(): void {
     const now = new Date().getTime();
-    if (now - lastStatus > 1000 && !cancelled) {
+    if (now - lastStatus > 4000 && !cancelled) {
         // tslint:disable-next-line no-console
-        console.log(`Success: ${successCount}, Retries: ${retryCount}, Total Time: ${now - startStatus} ms`);
+        console.log(`Success: ${successCount}, Retries: ${retryCount}, Total Time: ${now - startTime} ms`);
         lastStatus = now;
     }
 }
@@ -111,7 +111,7 @@ async function doUpserts(): Promise<void> {
         }
     }
 
-    startStatus = new Date().getTime();
+    startTime = new Date().getTime();
     const id = setTimeout(
         () => {
             cancelled = true;
diff --git a/tests/integration/bank.spec.ts b/tests/integration/bank.spec.ts
@@ -37,13 +37,23 @@ async function createAccounts(): Promise<void> {
     });
 }
 
-let startStatus = 0; // set before Promise.all
+let startTime = 0; // set before Promise.all
+let lastStatus = new Date().getTime();
 let cancelled = false;
 let finished = false;
 
 let runs = 0;
 let aborts = 0;
 
+function conditionalLog(): void {
+    const now = new Date().getTime();
+    if (now - lastStatus > 4000 && !cancelled) {
+        // tslint:disable-next-line no-console
+        console.log(`Runs: ${runs}, Aborts: ${aborts}, Total Time: ${new Date().getTime() - startTime} ms`);
+        lastStatus = now;
+    }
+}
+
 async function runTotal(): Promise<void> {
     const res = await client.newTxn().query(`{
         var(func: uid(${uids.join(",")})) {
@@ -55,9 +65,7 @@ async function runTotal(): Promise<void> {
     }`);
     // tslint:disable-next-line no-unsafe-any
     expect((<{ total: { bal: number }[] }>res.data).total[0].bal).toBe(uids.length * initialBalance);
-
-    // tslint:disable-next-line no-console
-    console.log(`Runs: ${runs}, Aborts: ${aborts}, Total Time: ${new Date().getTime() - startStatus} ms`);
+    conditionalLog();
 }
 
 async function runTotalInLoop(): Promise<void> {
@@ -129,7 +137,7 @@ describe("bank", () => {
             promises.push(runTxnInLoop());
         }
 
-        startStatus = new Date().getTime();
+        startTime = new Date().getTime();
         const id = setTimeout(
             () => {
                 cancelled = true;

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@ export declare class Txn {`
`13`	`13`	`mutate(mu: Mutation): Promise<Assigned>;`
`14`	`14`	`commit(): Promise<void>;`
`15`	`15`	`discard(): Promise<void>;`
	`16`	`+ private mergeArrays;`
`16`	`17`	`private mergeContext;`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ async function tryUpsert(account: Account): Promise<void> {`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`-let startStatus = 0; // set at the start of doUpserts`
	`70`	`+let startTime = 0; // set at the start of doUpserts`
`71`	`71`	`let lastStatus = 0;`
`72`	`72`	`let cancelled = false; // cancelled due to timeout`
`73`	`73`
`@@ -76,9 +76,9 @@ let retryCount = 0;`
`76`	`76`
`77`	`77`	`function conditionalLog(): void {`
`78`	`78`	`const now = new Date().getTime();`
`79`		`- if (now - lastStatus > 1000 && !cancelled) {`
	`79`	`+ if (now - lastStatus > 4000 && !cancelled) {`
`80`	`80`	`// tslint:disable-next-line no-console`
`81`		- console.log(`Success: ${successCount}, Retries: ${retryCount}, Total Time: ${now - startStatus} ms`);
	`81`	+ console.log(`Success: ${successCount}, Retries: ${retryCount}, Total Time: ${now - startTime} ms`);
`82`	`82`	`lastStatus = now;`
`83`	`83`	`}`
`84`	`84`	`}`
`@@ -111,7 +111,7 @@ async function doUpserts(): Promise<void> {`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
`114`		`- startStatus = new Date().getTime();`
	`114`	`+ startTime = new Date().getTime();`
`115`	`115`	`const id = setTimeout(`
`116`	`116`	`() => {`
`117`	`117`	`cancelled = true;`