fix broken roundtrip tests (finos#2753)

MauricioUyaguari · Nov 2, 2023 · 8254d76 · 8254d76
1 parent 5e96592
commit 8254d76
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 1 deletion.
diff --git a/.changeset/curly-moose-sparkle.md b/.changeset/curly-moose-sparkle.md
@@ -0,0 +1,5 @@
+---
+'@finos/legend-extension-dsl-persistence': patch
+'@finos/legend-extension-dsl-data-space': patch
+'@finos/legend-graph': patch
+---
diff --git a/...xtension-dsl-data-space/src/graph-manager/__tests__/TEST_DATA__DSL_DataSpace_Roundtrip.ts b/...xtension-dsl-data-space/src/graph-manager/__tests__/TEST_DATA__DSL_DataSpace_Roundtrip.ts
@@ -45,6 +45,7 @@ export const TEST_DATA__roundtrip = [
       package: 'test::model',
       runtimeValue: {
         _type: 'engineRuntime',
+        connectionStores: [],
         connections: [],
         mappings: [
           {

diff --git a/...sion-dsl-persistence/src/graph-manager/__tests__/TEST_DATA_DSL_PersistenceV2_Roundtrip.ts b/...sion-dsl-persistence/src/graph-manager/__tests__/TEST_DATA_DSL_PersistenceV2_Roundtrip.ts
@@ -152,6 +152,7 @@ export const TEST_DATA__roundtrip_append_only_allow_duplicates = [
         mapping: 'test::Mapping',
         runtime: {
           _type: 'engineRuntime',
+          connectionStores: [],
           connections: [],
           mappings: [
             {
@@ -447,6 +448,7 @@ export const TEST_DATA__roundtrip_bitemporal_no_del_ind_user_specifies_from = [
         mapping: 'test::Mapping',
         runtime: {
           _type: 'engineRuntime',
+          connectionStores: [],
           connections: [],
           mappings: [
             {
@@ -724,6 +726,7 @@ export const TEST_DATA__roundtrip_non_temporal_snapshot_date_time_audit = [
         mapping: 'test::Mapping',
         runtime: {
           _type: 'engineRuntime',
+          connectionStores: [],
           connections: [],
           mappings: [
             {
@@ -1351,6 +1354,7 @@ export const TEST_DATA__roundtrip_graph_fetch_basic = [
       package: 'test::runtime',
       runtimeValue: {
         _type: 'engineRuntime',
+        connectionStores: [],
         connections: [
           {
             store: {
@@ -1386,6 +1390,7 @@ export const TEST_DATA__roundtrip_graph_fetch_basic = [
       package: 'test::runtime',
       runtimeValue: {
         _type: 'engineRuntime',
+        connectionStores: [],
         connections: [
           {
             store: {

diff --git a/...nsion-dsl-persistence/src/graph-manager/__tests__/TEST_DATA__DSL_Persistence_Roundtrip.ts b/...nsion-dsl-persistence/src/graph-manager/__tests__/TEST_DATA__DSL_Persistence_Roundtrip.ts
@@ -163,6 +163,7 @@ export const TEST_DATA__roundtrip_case1 = [
         mapping: 'org::dxl::Mapping',
         runtime: {
           _type: 'engineRuntime',
+          connectionStores: [],
           connections: [],
           mappings: [{ path: 'org::dxl::Mapping', type: 'MAPPING' }],
         },
@@ -484,6 +485,7 @@ export const TEST_DATA__roundtrip_case2 = [
         mapping: 'org::dxl::Mapping',
         runtime: {
           _type: 'engineRuntime',
+          connectionStores: [],
           connections: [],
           mappings: [
             {
@@ -783,6 +785,7 @@ export const TEST_DATA__cloud__roundtrip = [
         mapping: 'org::dxl::Mapping',
         runtime: {
           _type: 'engineRuntime',
+          connectionStores: [],
           connections: [],
           mappings: [
             {

diff --git a/...legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__RuntimeRoundtrip.ts b/...legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__RuntimeRoundtrip.ts
@@ -73,6 +73,7 @@ export const TEST_DATA__RuntimeRoundtrip = [
       package: 'test',
       runtimeValue: {
         _type: 'engineRuntime',
+        connectionStores: [],
         connections: [
           {
             store: {

diff --git a/...legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__ServiceRoundtrip.ts b/...legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__ServiceRoundtrip.ts
@@ -184,6 +184,7 @@ export const TEST_DATA__ServiceRoundtrip = [
         mapping: 'my::map',
         runtime: {
           _type: 'engineRuntime',
+          connectionStores: [],
           connections: [],
           mappings: [
             {
@@ -328,6 +329,7 @@ export const TEST_DATA__ServiceRoundtrip = [
         mapping: 'my::map',
         runtime: {
           _type: 'engineRuntime',
+          connectionStores: [],
           connections: [],
           mappings: [
             {
@@ -456,6 +458,7 @@ export const TEST_DATA__ServiceRoundtrip = [
         mapping: 'my::map',
         runtime: {
           _type: 'engineRuntime',
+          connectionStores: [],
           connections: [],
           mappings: [
             {
@@ -811,6 +814,7 @@ export const TEST_DATA__ServiceRoundtrip = [
         mapping: 'my::map',
         runtime: {
           _type: 'engineRuntime',
+          connectionStores: [],
           connections: [],
           mappings: [
             {
@@ -955,6 +959,7 @@ export const TEST_DATA__ServiceRoundtrip = [
         mapping: 'my::map',
         runtime: {
           _type: 'engineRuntime',
+          connectionStores: [],
           connections: [],
           mappings: [
             {
@@ -1115,6 +1120,7 @@ export const TEST_DATA__ServiceRoundtrip = [
         mapping: 'test::tMapping',
         runtime: {
           _type: 'engineRuntime',
+          connectionStores: [],
           connections: [
             {
               store: {
@@ -1168,6 +1174,7 @@ export const TEST_DATA__ServiceRoundtrip = [
       package: 'test',
       runtimeValue: {
         _type: 'engineRuntime',
+        connectionStores: [],
         connections: [],
         mappings: [
           {
@@ -1683,6 +1690,7 @@ export const TEST_DATA__SERVICE_WITH_ONLY_QUERY_Roundtrip = [
       package: 'execution',
       runtimeValue: {
         _type: 'engineRuntime',
+        connectionStores: [],
         connections: [
           {
             store: {

diff --git a/...-graph/src/graph-manager/protocol/pure/v1/model/packageableElements/runtime/V1_Runtime.ts b/...-graph/src/graph-manager/protocol/pure/v1/model/packageableElements/runtime/V1_Runtime.ts
@@ -18,6 +18,7 @@ import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.j
 import { type Hashable, hashArray } from '@finos/legend-shared';
 import type { V1_PackageableElementPointer } from '../../../model/packageableElements/V1_PackageableElement.js';
 import type { V1_Connection } from '../../../model/packageableElements/connection/V1_Connection.js';
+import type { V1_ConnectionPointer } from '../connection/V1_ConnectionPointer.js';
 
 export abstract class V1_Runtime implements Hashable {
   abstract get hashCode(): string;
@@ -49,14 +50,29 @@ export class V1_StoreConnections implements Hashable {
   }
 }
 
+export class V1_ConnectionStores implements Hashable {
+  connectionPointer!: V1_ConnectionPointer;
+  storePointers: V1_PackageableElementPointer[] = [];
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.STORE_CONNECTIONS,
+      this.connectionPointer,
+      hashArray(this.storePointers),
+    ]);
+  }
+}
+
 export class V1_EngineRuntime extends V1_Runtime implements Hashable {
   mappings: V1_PackageableElementPointer[] = [];
+  connectionStores: V1_ConnectionStores[] = [];
   connections: V1_StoreConnections[] = [];
 
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.ENGINE_RUNTIME,
       hashArray(this.mappings),
+      hashArray(this.connectionStores),
       hashArray(this.connections),
     ]);
   }

diff --git a/...pure/v1/transformation/pureProtocol/serializationHelpers/V1_RuntimeSerializationHelper.ts b/...pure/v1/transformation/pureProtocol/serializationHelpers/V1_RuntimeSerializationHelper.ts
@@ -38,10 +38,12 @@ import {
   V1_LegacyRuntime,
   V1_RuntimePointer,
   V1_StoreConnections,
+  V1_ConnectionStores,
 } from '../../../model/packageableElements/runtime/V1_Runtime.js';
 import {
   V1_serializeConnectionValue,
   V1_deserializeConnectionValue,
+  V1_connectionPointerModelSchema,
 } from './V1_ConnectionSerializationHelper.js';
 import type { PureProtocolProcessorPlugin } from '../../../../PureProtocolProcessorPlugin.js';
 
@@ -86,12 +88,19 @@ export const V1_setupEngineRuntimeSerialization = (
     ),
     id: primitive(),
   });
+  createModelSchema(V1_ConnectionStores, {
+    connectionPointer: usingModelSchema(V1_connectionPointerModelSchema),
+    storePointers: list(
+      usingModelSchema(V1_packageableElementPointerModelSchema),
+    ),
+  });
   createModelSchema(V1_StoreConnections, {
     store: usingModelSchema(V1_packageableElementPointerModelSchema),
     storeConnections: list(object(V1_IdentifiedConnection)),
   });
   createModelSchema(V1_EngineRuntime, {
     _type: usingConstantValueSchema(V1_RuntimeType.ENGINE_RUNTIME),
+    connectionStores: list(object(V1_ConnectionStores)),
     connections: list(object(V1_StoreConnections)),
     mappings: list(usingModelSchema(V1_packageableElementPointerModelSchema)),
   });

diff --git a/packages/legend-graph/src/graph/metamodel/pure/packageableElements/runtime/Runtime.ts b/packages/legend-graph/src/graph/metamodel/pure/packageableElements/runtime/Runtime.ts
@@ -19,7 +19,10 @@ import {
   CORE_HASH_STRUCTURE,
   hashElementPointer,
 } from '../../../../../graph/Core_HashUtils.js';
-import type { Connection } from '../connection/Connection.js';
+import type {
+  Connection,
+  ConnectionPointer,
+} from '../connection/Connection.js';
 import type { PackageableRuntime } from './PackageableRuntime.js';
 import type { Mapping } from '../mapping/Mapping.js';
 import type { Store } from '../store/Store.js';
@@ -66,12 +69,37 @@ export class StoreConnections implements Hashable {
   }
 }
 
+export class ConnectionStores implements Hashable {
+  connectionPointer: ConnectionPointer;
+  storePointers: PackageableElementReference<Store>[] = [];
+
+  constructor(connectionPointer: ConnectionPointer) {
+    this.connectionPointer = connectionPointer;
+  }
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.STORE_CONNECTIONS,
+      this.connectionPointer,
+      hashArray(
+        this.storePointers.map((s) =>
+          hashElementPointer(
+            PackageableElementPointerType.STORE,
+            s.valueForSerialization ?? '',
+          ),
+        ),
+      ),
+    ]);
+  }
+}
+
 export abstract class Runtime implements Hashable {
   abstract get hashCode(): string;
 }
 
 export class EngineRuntime extends Runtime implements Hashable {
   mappings: PackageableElementReference<Mapping>[] = [];
+  connectionStores: ConnectionStores[] = [];
   connections: StoreConnections[] = [];
 
   get hashCode(): string {
@@ -85,6 +113,7 @@ export class EngineRuntime extends Runtime implements Hashable {
           ),
         ),
       ),
+      hashArray(this.connectionStores),
       hashArray(
         this.connections.filter(
           // TODO: use `isStubbed_StoreConnections` when we refactor hashing