Remove linRead

Author: Paul Korzhyk

jest.config.js

@@ -1,19 +1,17 @@
 module.exports = {
     testEnvironment: "node",
     transform: {
-      ".(ts|tsx)": "ts-jest"
+      ".ts": "ts-jest"
     },
     moduleFileExtensions: [
       "ts",
-      "tsx",
       "js",
-      "jsx",
     ],
-    testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.(ts|js)x?$",
+    testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.(ts|js)$",
     coverageDirectory: "coverage",
     collectCoverageFrom: [
-      "src/**/*.{ts,tsx,js,jsx}",
-      "!src/index.{ts,tsx,js,jsx}",
+      "src/**/*.{ts,js}",
+      "!src/index.{ts,js}",
       "!src/**/*.d.ts",
     ],
 };

lib/client.d.ts

@@ -1,16 +1,13 @@
 import { DgraphClientStub } from "./clientStub";
 import { Txn } from "./txn";
-import { LinRead, Operation, Payload } from "./types";
+import { Operation, Payload } from "./types";
 export declare class DgraphClient {
     private readonly clients;
-    private readonly linRead;
     private debugMode;
     constructor(...clients: DgraphClientStub[]);
     alter(op: Operation): Promise<Payload>;
     newTxn(): Txn;
     setDebugMode(mode?: boolean): void;
     debug(msg: string): void;
-    getLinRead(): LinRead;
-    mergeLinReads(src?: LinRead | null): void;
     anyClient(): DgraphClientStub;
 }

lib/client.js

@@ -14,8 +14,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
         while (_) try {
-            if (f = 1, y && (t = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [0, t.value];
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
                 case 0: case 1: t = op; break;
                 case 4: _.label++; return { value: op[1], done: false };
@@ -49,7 +49,6 @@ var DgraphClient = (function () {
             throw errors_1.ERR_NO_CLIENTS;
         }
         this.clients = clients;
-        this.linRead = { ids: {} };
     }
     DgraphClient.prototype.alter = function (op) {
         return __awaiter(this, void 0, void 0, function () {
@@ -73,17 +72,6 @@ var DgraphClient = (function () {
             console.log(msg);
         }
     };
-    DgraphClient.prototype.getLinRead = function () {
-        var _this = this;
-        var lr = { ids: {} };
-        Object.keys(this.linRead.ids).forEach(function (group) {
-            lr.ids[group] = _this.linRead.ids[group];
-        });
-        return lr;
-    };
-    DgraphClient.prototype.mergeLinReads = function (src) {
-        util_1.mergeLinReads(this.linRead, src);
-    };
     DgraphClient.prototype.anyClient = function () {
         return this.clients[Math.floor(Math.random() * this.clients.length)];
     };

lib/clientStub.d.ts

@@ -9,6 +9,6 @@ export declare class DgraphClientStub {
     commit(ctx: TxnContext): Promise<TxnContext>;
     abort(ctx: TxnContext): Promise<TxnContext>;
     health(): Promise<string>;
-    private callAPI<T>(path, config);
-    private getURL(path);
+    private callAPI;
+    private getURL;
 }

lib/clientStub.js

@@ -5,7 +5,7 @@ var errors_1 = require("./errors");
 var DgraphClientStub = (function () {
     function DgraphClientStub(addr) {
         if (addr == null) {
-            this.addr = "localhost:8080";
+            this.addr = "http://localhost:8080";
         }
         else {
             this.addr = addr;
@@ -35,9 +35,6 @@ var DgraphClientStub = (function () {
         if (req.vars != null) {
             headers["X-Dgraph-Vars"] = JSON.stringify(req.vars);
         }
-        if (req.linRead != null) {
-            headers["X-Dgraph-LinRead"] = JSON.stringify(req.linRead.ids);
-        }
         return this.callAPI("query" + (req.startTs == null ? "" : "/" + req.startTs), {
             method: "POST",
             body: req.query,

lib/errors.js

@@ -20,11 +20,11 @@ var CustomError = (function (_super) {
         var _this = _super.call(this, message) || this;
         _this.name = _newTarget.name;
         var setPrototypeOf = Object.setPrototypeOf;
-        setPrototypeOf
+        setPrototypeOf != null
             ? setPrototypeOf(_this, _newTarget.prototype)
             : (_this.__proto__ = _newTarget.prototype);
         var captureStackTrace = Error.captureStackTrace;
-        if (captureStackTrace) {
+        if (captureStackTrace != null) {
             captureStackTrace(_this, _this.constructor);
         }
         return _this;

lib/txn.d.ts

@@ -13,5 +13,5 @@ export declare class Txn {
     mutate(mu: Mutation): Promise<Assigned>;
     commit(): Promise<void>;
     discard(): Promise<void>;
-    private mergeContext(src?);
+    private mergeContext;
 }

lib/txn.js

@@ -14,8 +14,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
         while (_) try {
-            if (f = 1, y && (t = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [0, t.value];
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
                 case 0: case 1: t = op; break;
                 case 4: _.label++; return { value: op[1], done: false };
@@ -42,7 +42,7 @@ var Txn = (function () {
         this.finished = false;
         this.mutated = false;
         this.dc = dc;
-        this.ctx = { start_ts: 0, lin_read: this.dc.getLinRead() };
+        this.ctx = { start_ts: 0 };
     }
     Txn.prototype.query = function (q) {
         return this.queryWithVars(q, null);
@@ -60,7 +60,6 @@ var Txn = (function () {
                         req = {
                             query: q,
                             startTs: this.ctx.start_ts,
-                            linRead: this.ctx.lin_read,
                         };
                         if (vars != null) {
                             varsObj_1 = {};
@@ -182,11 +181,10 @@ var Txn = (function () {
         });
     };
     Txn.prototype.mergeContext = function (src) {
+        var _a;
         if (src == null) {
             return;
         }
-        util_1.mergeLinReads(this.ctx.lin_read, src.lin_read);
-        this.dc.mergeLinReads(src.lin_read);
         if (this.ctx.start_ts === 0) {
             this.ctx.start_ts = src.start_ts;
         }
@@ -201,7 +199,6 @@ var Txn = (function () {
                 (_a = this.ctx.keys).push.apply(_a, src.keys);
             }
         }
-        var _a;
     };
     return Txn;
 }());

lib/types.d.ts

@@ -12,7 +12,6 @@ export interface Request {
         [k: string]: string;
     } | null;
     startTs?: number | null;
-    linRead?: LinRead | null;
 }
 export interface Response {
     data: {};
@@ -32,24 +31,18 @@ export interface Assigned {
 }
 export interface AssignedData {
     uids: {
-        [k: string]: number;
+        [k: string]: string;
     };
 }
 export interface Extensions {
     server_latency: Latency;
     txn: TxnContext;
 }
-export interface LinRead {
-    ids: {
-        [k: string]: number;
-    };
-}
 export interface TxnContext {
     start_ts: number;
     commit_ts?: number | null;
     aborted?: boolean | null;
     keys?: string[] | null;
-    lin_read: LinRead;
 }
 export interface Latency {
     parsing_ns?: number | null;

lib/util.d.ts

@@ -1,5 +1,3 @@
-import { LinRead } from "./types";
-export declare function mergeLinReads(target: LinRead, src?: LinRead | null): LinRead;
 export declare function isAbortedError(error: any): boolean;
 export declare function isConflictError(error: any): boolean;
 export declare function stringifyMessage(msg: object): string;