noHandledMp check

Author: ivansglazunov

check.ts

@@ -103,17 +103,29 @@ export const check = async (hash: { [name:string]: number }, type_id: number) =>
   return { nodes, mp };
 };
 
-export const checkManual = async (links: [number, number, number, number, [number, number][]][], type_id: number, GRAPH_TABLE: string, MP_TABLE: string) => {
+export const checkManual = async (input: [number, number, number, number, [number, number][]][], type_id: number, GRAPH_TABLE: string, MP_TABLE: string) => {
   const { nodes, mp } = await fetch(type_id, ID_TYPE, GRAPH_TABLE, MP_TABLE);
 
   const ns = [];
   const ls = [];
+  const handledMP = {};
 
   for (let i = 0; i < nodes.length; i++) {
     const n = nodes[i];
-    const l = links[i];
-    ns.push({ id: n.id, from_id: n.from_id || 0, to_id: n.to_id || 0, type_id: n.type_id || 0, _by_item: mp.filter(mp => mp.item_id === n.id).map(a => ({ root_id: a.root_id, path_item_id: a.path_item_id })) });
-    ls.push({ id: l[0], from_id: l[1], to_id: l[2], type_id: l[3], _by_item: l[4].map(a => ({ root_id: a[0], path_item_id: a[1] })) });
+    const l = input[i];
+    ns.push({ id: n.id, from_id: n.from_id || 0, to_id: n.to_id || 0, type_id: n.type_id || 0, _by_item: mp.filter((mp) => {
+      handledMP[mp.id] = true;
+      return mp.item_id === n.id;
+    }).map(a => ({ root_id: a.root_id, path_item_id: a.path_item_id })) });
+    ls.push({ id: l[0], from_id: l[1], to_id: l[2], type_id: l[3], _by_item: l[4].map((a) => {
+      return { root_id: a[0], path_item_id: a[1] };
+    }) });
   }
   assert.deepStrictEqual(ns, ls);
+  const notHandledMp = [];
+  for (let i = 0; i < mp.length; i++) {
+    const mark = mp[i];
+    if (!handledMP[mark.id]) notHandledMp[mark.id];
+  }
+  if (notHandledMp.length) throw new Error(`Not handled MP marks: ${notHandledMp}`);
 }

imports/multidirectional.ts

@@ -188,3 +188,51 @@ export const testRecursiveSameRoot = (needCheck = true) => async () => {
   }
   if (!errored) throw new Error('Recursion error not exists');
 };
+export const testSeparation1 = (needCheck = true) => async () => {
+  debug('testSeparation1');
+  await clear(type_id);
+  const a = await insertNode(type_id, 'node');
+  const b = await insertNode(type_id, 'node');
+  const c = await insertNode(type_id, 'node');
+  const d = await insertNode(type_id, 'node');
+  const e = await insertNode(type_id, 'node');
+  const x = await insertLink(a, b, type_id, 'down');
+  const y = await insertLink(b, c, type_id, 'down');
+  const z = await insertLink(c, d, type_id, 'down');
+  const w = await insertLink(d, e, type_id, 'down');
+  if (needCheck) await checkManual([
+    [a,0,0,type_id,[[a,a]]],
+    [b,0,0,type_id,[[a,a],[a,x],[a,b]]],
+    [c,0,0,type_id,[[a,a],[a,x],[a,b],[a,y],[a,c]]],
+    [d,0,0,type_id,[[a,a],[a,x],[a,b],[a,y],[a,c],[a,z],[a,d]]],
+    [e,0,0,type_id,[[a,a],[a,x],[a,b],[a,y],[a,c],[a,z],[a,d],[a,w],[a,e]]],
+    [x,a,b,type_id,[[a,a],[a,x]]],
+    [y,b,c,type_id,[[a,a],[a,x],[a,b],[a,y]]],
+    [z,c,d,type_id,[[a,a],[a,x],[a,b],[a,y],[a,c],[a,z]]],
+    [w,d,e,type_id,[[a,a],[a,x],[a,b],[a,y],[a,c],[a,z],[a,d],[a,w]]],
+  ], type_id, GRAPH_TABLE, MP_TABLE);
+};
+export const testSeparation2 = (needCheck = true) => async () => {
+  debug('testSeparation2');
+  await clear(type_id);
+  const a = await insertNode(type_id, 'node');
+  const b = await insertNode(type_id, 'node');
+  const c = await insertNode(type_id, 'node'); // -
+  const d = await insertNode(type_id, 'node'); // |
+  const e = await insertNode(type_id, 'node'); // |
+  const x = await insertLink(a, b, type_id, 'down');
+  const y = await insertLink(b, c, type_id, 'down'); // -
+  const z = await insertLink(c, d, type_id, 'down'); // |
+  const w = await insertLink(d, e, type_id, 'down'); // |
+  await deleteNode(y); // -
+  if (needCheck) await checkManual([
+    [a,0,0,type_id,[[a,a]]],
+    [b,0,0,type_id,[[a,a],[a,x],[a,b]]],
+    [c,0,0,type_id,[[c,c]]],
+    [d,0,0,type_id,[[c,c],[c,z],[c,d]]],
+    [e,0,0,type_id,[[c,c],[c,z],[c,d],[c,w],[c,e]]],
+    [x,a,b,type_id,[[a,a],[a,x]]],
+    [z,c,d,type_id,[[c,c],[c,z]]],
+    [w,d,e,type_id,[[c,c],[c,z],[c,d],[c,w]]],
+  ], type_id, GRAPH_TABLE, MP_TABLE);
+};

package.json

@@ -25,12 +25,12 @@
     "package:build": "npx tsc --project tsconfig.json && (cd ./migrations && rm -f ./*.js; rm -f ./*.js.map; rm -f ./*.d.ts)",
     "package:unbuild": "rm -f ./*.js; rm -f ./*.js.map; rm -f ./*.d.ts && (cd ./migrations && rm -f ./*.js; rm -f ./*.js.map; rm -f ./*.d.ts) && (cd ./tests && rm -f ./*.js; rm -f ./*.js.map; rm -f ./*.d.ts)",
     "package:publish": "npm run package:build; npm publish --access public; npm run package:unbuild",
-    "test": "export HASURA_PATH=localhost:8080; export HASURA_SSL=0; export HASURA_SECRET=myadminsecretkey; DEBUG='deepcase:*' jest",
+    "test": "export HASURA_PATH=localhost:8080; export HASURA_SSL=0; export HASURA_SECRET=myadminsecretkey; DEBUG='materialized-path:*' jest",
     "migrate": "export MIGRATIONS_HASURA_PATH=localhost:8080; export MIGRATIONS_HASURA_SSL=0; export MIGRATIONS_HASURA_SECRET=myadminsecretkey; export $(grep -v '^#' .env | xargs); yes | DEBUG='deepcase:*' npx migrate up --compiler='ts:@deep-foundation/hasura/compiler/index.js'",
     "unmigrate": "export MIGRATIONS_HASURA_PATH=localhost:8080; export MIGRATIONS_HASURA_SSL=0; export MIGRATIONS_HASURA_SECRET=myadminsecretkey; export $(grep -v '^#' .env | xargs); yes | DEBUG='deepcase:*' npx migrate down --compiler='ts:@deep-foundation/hasura/compiler/index.js'",
     "hasura": "(cd node_modules/@deep-foundation/hasura; npm run docker)",
     "clear": "(killall screen; rm -rf .migrate; cd node_modules/@deep-foundation/hasura/local/; docker-compose down; docker rm -f $(docker ps -a -q); docker volume rm $(docker volume ls -q))",
-    "benchmark": "export HASURA_PATH=localhost:8080; export HASURA_SSL=0; export HASURA_SECRET=myadminsecretkey; DEBUG='deepcase:*' ts-node benchmarks/index.ts"
+    "benchmark": "export HASURA_PATH=localhost:8080; export HASURA_SSL=0; export HASURA_SECRET=myadminsecretkey; DEBUG='materialized-path:*' ts-node benchmarks/index.ts"
   },
   "devDependencies": {
     "@deep-foundation/hasura": "^0.0.3",

tests/multidirectional.ts

@@ -6,7 +6,7 @@ import Chance from 'chance';
 import { check, checkManual } from '../check';
 import { client } from '../client';
 import fs from 'fs';
-import { beforeAllHandler, prepare, testMinus15, testPlus15, testRecursive, testRecursiveSameRoot } from '../imports/multidirectional';
+import { beforeAllHandler, prepare, testMinus15, testPlus15, testRecursive, testRecursiveSameRoot, testSeparation1, testSeparation2 } from '../imports/multidirectional';
 
 const chance = new Chance();
 const debug = Debug('materialized-path:test');
@@ -36,3 +36,7 @@ itDelay();
 it('recursive', testRecursive(true));
 itDelay();
 it('recursiveSameRoot', testRecursiveSameRoot(true));
+itDelay();
+it('testSeparation1', testSeparation1(true));
+itDelay();
+it('testSeparation2', testSeparation2(true));