Skip to content

Exclude children when computing the external references of a Package #1211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevin-m-knight-gs merged 2 commits into from
Mar 9, 2026
Merged

Exclude children when computing the external references of a Package #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
876d579
Exclude children when computing the external references of a Package
kevin-m-knight-gs Mar 9, 2026
6bc0e98
Add a test for serializing repos singly vs multiply
kevin-m-knight-gs Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...inos/legend/pure/m3/serialization/compiler/metadata/ConcreteElementMetadataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ class ConcreteElementMetadataGenerator
private final ReferenceIdProvider referenceIdProvider;
private final ContainingElementIndex containingElementIndex;
private final ProcessorSupport processorSupport;
private final MapIterable<String, ImmutableList<String>> backReferenceProperties = M3PropertyPaths.BACK_REFERENCE_PROPERTY_PATHS.groupByUniqueKey(ImmutableList::getLast, Maps.mutable.ofInitialCapacity(M3PropertyPaths.BACK_REFERENCE_PROPERTY_PATHS.size()));
private final MapIterable<String, ImmutableList<String>> backReferenceProperties = M3PropertyPaths.BACK_REFERENCE_PROPERTY_PATHS.groupByUniqueKey(
ImmutableList::getLast,
Maps.mutable.ofInitialCapacity(M3PropertyPaths.BACK_REFERENCE_PROPERTY_PATHS.size() + 1))
.withKeyValue(M3PropertyPaths.children.getLast(), M3PropertyPaths.children);
private final ConcurrentMutableMap<CoreInstance, String> elementPathCache = ConcurrentHashMap.newMap();
private final ConcurrentMutableMap<CoreInstance, BackReferenceCollector> backRefCollectorCache = ConcurrentHashMap.newMap();

Expand Down
14 changes: 14 additions & 0 deletions ...est/java/org/finos/legend/pure/m3/generator/compiler/TestPureCompilerBinaryGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,20 @@ public void testSerializeWithExcludedModule() throws IOException
assertModuleNotSerialized(deserializer, outputDirectory, OTHER_TEST_REPO);
}

@Test
public void testSerializeSingleVsMultiple() throws IOException
{
Path multiOutputDir = TMP.newFolder().toPath();
PureCompilerBinaryGenerator.serializeModules(multiOutputDir, Lists.immutable.with(PLATFORM, TEST_REPO, OTHER_TEST_REPO));

Path singleOutputDir = TMP.newFolder().toPath();
PureCompilerBinaryGenerator.serializeModules(singleOutputDir, Lists.immutable.with(PLATFORM));
PureCompilerBinaryGenerator.serializeModules(singleOutputDir, Lists.immutable.with(TEST_REPO));
PureCompilerBinaryGenerator.serializeModules(singleOutputDir, Lists.immutable.with(OTHER_TEST_REPO));

assertDirectoriesEquivalent(multiOutputDir, singleOutputDir);
}

private static void assertModuleSerialized(FileDeserializer deserializer, Path outputDirectory, String moduleName)
{
Assert.assertTrue(moduleName + " manifest should exist", deserializer.moduleManifestExists(outputDirectory, moduleName));
Expand Down
18 changes: 16 additions & 2 deletions ...org/finos/legend/pure/m3/serialization/compiler/metadata/TestModuleMetadataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import org.finos.legend.pure.m3.serialization.filesystem.repository.GenericCodeRepository;
import org.finos.legend.pure.m3.serialization.filesystem.usercodestorage.classpath.ClassLoaderCodeStorage;
import org.finos.legend.pure.m3.serialization.filesystem.usercodestorage.composite.CompositeCodeStorage;
import org.finos.legend.pure.m3.serialization.runtime.PureRuntime;
import org.finos.legend.pure.m3.serialization.runtime.PureRuntimeBuilder;
import org.finos.legend.pure.m3.tools.GraphTools;
import org.junit.After;
import org.junit.Assert;
Expand Down Expand Up @@ -123,8 +125,20 @@ public void testAllModules()
{
Assert.assertEquals(
getAllModuleMetadata().sortThisBy(ModuleMetadata::getName),
this.generator.generateAllModuleMetadata().sortThisBy(ModuleMetadata::getName)
);
this.generator.generateAllModuleMetadata().sortThisBy(ModuleMetadata::getName));
}

@Test
public void testIndividualVsMultiRepoGeneration()
{
ModuleMetadata platformFromMultiRepo = this.generator.generateModuleMetadata("platform");

CompositeCodeStorage platformOnlyStorage = new CompositeCodeStorage(
new ClassLoaderCodeStorage(runtime.getCodeStorage().getRepository("platform")));
PureRuntime platformOnlyRuntime = new PureRuntimeBuilder(platformOnlyStorage).buildAndInitialize();
ModuleMetadata platformFromSingleRepo = ModuleMetadataGenerator.fromPureRuntime(platformOnlyRuntime).generateModuleMetadata("platform");

Assert.assertEquals(platformFromMultiRepo, platformFromSingleRepo);
}

private ModuleMetadata getModuleMetadata(String moduleName)
Expand Down
Loading