@superhero/eventflow-db 4.8.6 → 4.8.7

package/README.md

@@ -403,10 +403,10 @@ PARTITION BY RANGE (TO_DAYS(timestamp))
 
 ### Build the Environment
 
-The `build` script launches a MySQL container for testing:
+The `test-build` script launches a MySQL container for testing:
 
 ```sh
-npm run build
+npm run test-build
 ```
 
 ## Running Tests

package/index.test.js

@@ -310,6 +310,77 @@ suite('@superhero/eventflow-db', async () =>
         await assert.doesNotReject(db.persistLog(log))
       })
 
+      await sub.test('Read same-timestamp records deterministically', async () =>
+      {
+        const
+          suffix     = Date.now().toString(36),
+          timestamp  = '2000-01-01 00:00:00.000',
+          scheduled  = new Date(Date.now() + 60e3),
+          domain     = `order_domain_${suffix}`,
+          pid        = `order_pid_${suffix}`,
+          cpid       = `order_cpid_${suffix}`,
+          eid        = `order_eid_${suffix}`,
+          hubA       = `order_hub_${suffix}_a`,
+          hubB       = `order_hub_${suffix}_b`,
+          eventA     = `order_event_${suffix}_a`,
+          eventB     = `order_event_${suffix}_b`,
+          eventBase  = { timestamp, domain, pid, name:'order_event', data:{} }
+
+        await db.persistHub(
+        {
+          id            : hubB,
+          timestamp,
+          external_ip   : '127.0.0.1',
+          external_port : 50102,
+          internal_ip   : '127.0.0.1',
+          internal_port : 50102
+        })
+
+        await db.persistHub(
+        {
+          id            : hubA,
+          timestamp,
+          external_ip   : '127.0.0.1',
+          external_port : 50101,
+          internal_ip   : '127.0.0.1',
+          internal_port : 50101
+        })
+
+        await db.persistEvent({ ...eventBase, id:eventB, name:'order_event_b' })
+        await db.persistEvent({ ...eventBase, id:eventA, name:'order_event_a' })
+        await db.persistEventCpid(eventB, domain, cpid)
+        await db.persistEventCpid(eventA, domain, cpid)
+        await db.persistEventEid(eventB, eid)
+        await db.persistEventEid(eventA, eid)
+        await db.persistEventScheduled({ event_id:eventB, timestamp, scheduled })
+        await db.persistEventScheduled({ event_id:eventA, timestamp, scheduled })
+
+        const
+          orderedIDs    = [ eventA, eventB ],
+          onlineHubs   = await db.readOnlineHubs(),
+          eventlog     = await db.readEventsByDomainAndPid(domain, pid),
+          rangeEvents  = await db.readEventsByDomainAndPidBetweenTimestamps(domain, pid, timestamp, timestamp),
+          namedEvents  = await db.readEventsByDomainAndPidAndNames(domain, pid, [ 'order_event_a', 'order_event_b' ]),
+          cpidEvents   = await db.readEventsByDomainAndCpid(domain, cpid),
+          eidEvents    = await db.readEventsByEid(eid),
+          domainEid    = await db.readEventsByDomainAndEid(domain, eid),
+          scheduledLog = await db.readEventsScheduled()
+
+        assert.deepEqual(onlineHubs.filter((hub) => hub.id === hubA || hub.id === hubB).map((hub) => hub.id), [ hubA, hubB ])
+        assert.deepEqual(eventlog.map((event) => event.id),     orderedIDs)
+        assert.deepEqual(rangeEvents.map((event) => event.id),  orderedIDs)
+        assert.deepEqual(namedEvents.map((event) => event.id),  orderedIDs)
+        assert.deepEqual(cpidEvents.map((event) => event.id),   orderedIDs)
+        assert.deepEqual(eidEvents.map((event) => event.id),    orderedIDs)
+        assert.deepEqual(domainEid.map((event) => event.id),    orderedIDs)
+        assert.deepEqual(scheduledLog.filter((event) => orderedIDs.includes(event.event_id)).map((event) => event.event_id), orderedIDs)
+
+        await db.updateHubToQuit(hubA)
+        await db.updateHubToQuit(hubB)
+        await db.deleteEvent(eventA)
+        await db.deleteEvent(eventB)
+      })
+
       await sub.test('Update hub to quit', async () => 
       {
         const updated = await db.updateHubToQuit(hub.id)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superhero/eventflow-db",
-  "version": "4.8.6",
+  "version": "4.8.7",
   "description": "Eventflow db is a set of common database logic in the eventflow ecosystem.",
   "keywords": [
     "eventflow"
@@ -14,7 +14,7 @@
   "scripts": {
     "test-build": "docker ps -q -f name=eventflow-mysql | grep -q . && docker stop eventflow-mysql; docker run --rm --name eventflow-mysql -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=eventflow -p 3306:3306 --health-cmd=\"mysqladmin ping -h 127.0.0.1 -uroot -proot --silent || exit 1\" --health-interval=10s --health-timeout=5s --health-retries=5 -d mysql:latest; until [ \"$(docker inspect --format='{{.State.Health.Status}}' eventflow-mysql)\" == \"healthy\" ]; do sleep 1; done",
     "syntax-check": "syntax-check",
-    "test": "syntax-check; node --test --test-reporter=@superhero/audit/reporter --experimental-test-coverage"
+    "test": "syntax-check && node --test --test-reporter=@superhero/audit/reporter --experimental-test-coverage"
   },
   "dependencies": {
     "mysql2": "^3.16.1",

package/sql/certificate/schema.sql

@@ -1,6 +1,8 @@
 CREATE TABLE IF NOT EXISTS certificate 
 (
+  -- TODO: Change Eventflow fractional timestamp columns from DATETIME(3) to DATETIME(6).
   created   DATETIME(3)   NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+  -- TODO: Change Eventflow fractional timestamp columns from DATETIME(3) to DATETIME(6).
   updated   DATETIME(3)   NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
   version   INT UNSIGNED  NOT NULL DEFAULT 0,
   id        VARCHAR(64)   NOT NULL,

package/sql/event/read-by-pid-domain-betweeen-timestamps.sql

@@ -3,4 +3,6 @@ FROM event
 WHERE pid    = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
   AND domain = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
   AND timestamp BETWEEN ? AND ?
-ORDER BY timestamp ASC
+ORDER BY
+  timestamp ASC,
+  id        ASC

package/sql/event/read-by-pid-domain-names.sql

@@ -3,4 +3,6 @@ FROM event
 WHERE pid    = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
   AND domain = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
   AND name IN (?%s)
-ORDER BY timestamp ASC
+ORDER BY
+  timestamp ASC,
+  id        ASC

package/sql/event/read-by-pid-domain.sql

@@ -2,4 +2,6 @@ SELECT *
 FROM event
 WHERE pid    = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
   AND domain = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
-ORDER BY timestamp ASC
+ORDER BY
+  timestamp ASC,
+  id        ASC

package/sql/event/schema.sql

@@ -1,6 +1,7 @@
 CREATE TABLE IF NOT EXISTS event
 (
   id        VARCHAR(64) NOT NULL,
+  -- TODO: Change Eventflow fractional timestamp columns from DATETIME(3) to DATETIME(6).
   timestamp DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
   domain    VARCHAR(64) NOT NULL,
   rid       VARCHAR(64)     NULL,

package/sql/event_cpid/read-by-cpid-domain.sql

@@ -1,10 +1,12 @@
 SELECT event.*
 FROM event_cpid
 
-JOIN event 
-  ON event_id = event.id 
+JOIN event
+  ON event_id = event.id
 
 WHERE event_cpid.cpid   = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
   AND event_cpid.domain = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
 
-ORDER BY timestamp ASC
+ORDER BY
+  event.timestamp ASC,
+  event.id        ASC

package/sql/event_eid/read-by-eid-domain.sql

@@ -1,9 +1,11 @@
 SELECT event.*
 FROM event_eid
-JOIN event 
+JOIN event
   ON event_id = event.id
 
 WHERE eid    = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
   AND domain = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
 
-ORDER BY timestamp ASC
+ORDER BY
+  event.timestamp ASC,
+  event.id        ASC

package/sql/event_eid/read-by-eid.sql

@@ -1,7 +1,9 @@
 SELECT event.*
 FROM event_eid
-JOIN event 
+JOIN event
   ON event_id = event.id
 
 WHERE eid = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
-ORDER BY timestamp ASC
+ORDER BY
+  event.timestamp ASC,
+  event.id        ASC

package/sql/event_scheduled/read.sql

@@ -2,4 +2,6 @@ SELECT *
 FROM event_scheduled
 WHERE scheduled >= UTC_TIMESTAMP()
   AND executed IS NULL
-ORDER BY timestamp ASC
+ORDER BY
+  timestamp ASC,
+  event_id  ASC

package/sql/hub/read-online-hubs.sql

@@ -1,4 +1,6 @@
 SELECT *
 FROM hub
 WHERE quit IS NULL
-ORDER BY timestamp ASC
+ORDER BY
+  timestamp ASC,
+  id        ASC

package/sql/log/schema.sql

@@ -1,5 +1,6 @@
 CREATE TABLE IF NOT EXISTS log 
 (
+  -- TODO: Change Eventflow fractional timestamp columns from DATETIME(3) to DATETIME(6).
   timestamp DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
   agent     VARCHAR(64) NOT NULL,
   message   TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,