Various improvements (#3324)

finos · Dec 27, 2024 · e393c08 · e393c08
1 parent 2deb7cc
commit e393c08
Show file tree

Hide file tree

Showing 178 changed files with 281 additions and 248 deletions.
diff --git a/...rc/test/java/org/finos/legend/engine/extensions/collection/generation/TestExtensions.java b/...rc/test/java/org/finos/legend/engine/extensions/collection/generation/TestExtensions.java
@@ -94,7 +94,7 @@
 import org.finos.legend.engine.protocol.hostedService.metamodel.HostedServiceProtocolExtension;
 import org.finos.legend.engine.protocol.memsqlFunction.metamodel.MemSqlFunctionProtocolExtension;
 import org.finos.legend.engine.protocol.pure.v1.extension.ProtocolSubTypeInfo;
-import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
+import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
 import org.finos.legend.engine.shared.core.identity.Identity;
 import org.finos.legend.pure.code.core.ElasticsearchLegendPureCoreExtension;
 import org.finos.legend.engine.language.stores.elasticsearch.v7.to.ElasticsearchGrammarComposerExtension;

diff --git a/...nd-engine-repl-client/src/main/java/org/finos/legend/engine/repl/core/commands/Graph.java b/...nd-engine-repl-client/src/main/java/org/finos/legend/engine/repl/core/commands/Graph.java
@@ -22,7 +22,7 @@
 import org.finos.legend.engine.language.pure.grammar.to.PureGrammarComposerContext;
 import org.finos.legend.engine.language.pure.grammar.to.PureGrammarComposerUtility;
 import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
-import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
+import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
 import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.section.Section;
 import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.section.SectionIndex;
 import org.finos.legend.engine.repl.client.Client;

diff --git a/...pl-data-cube/src/test/java/org/finos/legend/engine/repl/dataCube/TestDataCubeHelpers.java b/...pl-data-cube/src/test/java/org/finos/legend/engine/repl/dataCube/TestDataCubeHelpers.java
@@ -248,7 +248,7 @@ public void testExtractRelationReturnTypeGroupBy()
     public void testExtractRelationReturnTypeCast()
     {
         String lambda = "|#>{test::TestDatabase.TEST0}#->filter(c | $c.FIRSTNAME != 'Doe')->from(test::test)->groupBy(~[FIRSTNAME], ~[count: x | $x.FIRSTNAME : y | $y->count()])->cast(@meta::pure::metamodel::relation::Relation<(hai:String,ba:Integer)>)";
-        String expectedResult = "{\"_type\":\"relationType\",\"columns\":[{\"genericType\":{\"multiplicityArguments\":[],\"rawType\":{\"_type\":\"packageableType\",\"fullPath\":\"String\"},\"typeArguments\":[],\"typeVariableValues\":[]},\"multiplicity\":{\"lowerBound\":1,\"upperBound\":1},\"name\":\"hai\"},{\"genericType\":{\"multiplicityArguments\":[],\"rawType\":{\"_type\":\"packageableType\",\"fullPath\":\"Integer\"},\"typeArguments\":[],\"typeVariableValues\":[]},\"multiplicity\":{\"lowerBound\":1,\"upperBound\":1},\"name\":\"ba\"}]}";
+        String expectedResult = "{\"_type\":\"relationType\",\"columns\":[{\"genericType\":{\"multiplicityArguments\":[],\"rawType\":{\"_type\":\"packageableType\",\"fullPath\":\"String\"},\"typeArguments\":[],\"typeVariableValues\":[]},\"multiplicity\":{\"lowerBound\":0,\"upperBound\":1},\"name\":\"hai\"},{\"genericType\":{\"multiplicityArguments\":[],\"rawType\":{\"_type\":\"packageableType\",\"fullPath\":\"Integer\"},\"typeArguments\":[],\"typeVariableValues\":[]},\"multiplicity\":{\"lowerBound\":0,\"upperBound\":1},\"name\":\"ba\"}]}";
         testExtractRelationReturnType(expectedResult, lambda, pureModelContextData);
     }
 
@@ -272,7 +272,7 @@ public void testExtractRelationReturnTypeMultipleExtend()
     public void testExtractRelationReturnTypeWithDummySource()
     {
         String lambda = "|''->cast(@meta::pure::metamodel::relation::Relation<(FIRSTNAME:String,LASTNAME:String)>)->extend(~[newCol:c|'ok', colX: c|$c.FIRSTNAME])";
-        String expectedResult = "{\"_type\":\"relationType\",\"columns\":[{\"genericType\":{\"multiplicityArguments\":[],\"rawType\":{\"_type\":\"packageableType\",\"fullPath\":\"String\"},\"typeArguments\":[],\"typeVariableValues\":[]},\"multiplicity\":{\"lowerBound\":1,\"upperBound\":1},\"name\":\"FIRSTNAME\"},{\"genericType\":{\"multiplicityArguments\":[],\"rawType\":{\"_type\":\"packageableType\",\"fullPath\":\"String\"},\"typeArguments\":[],\"typeVariableValues\":[]},\"multiplicity\":{\"lowerBound\":1,\"upperBound\":1},\"name\":\"LASTNAME\"},{\"genericType\":{\"multiplicityArguments\":[],\"rawType\":{\"_type\":\"packageableType\",\"fullPath\":\"String\"},\"typeArguments\":[],\"typeVariableValues\":[]},\"multiplicity\":{\"lowerBound\":1,\"upperBound\":1},\"name\":\"newCol\"},{\"genericType\":{\"multiplicityArguments\":[],\"rawType\":{\"_type\":\"packageableType\",\"fullPath\":\"String\"},\"typeArguments\":[],\"typeVariableValues\":[]},\"multiplicity\":{\"lowerBound\":1,\"upperBound\":1},\"name\":\"colX\"}]}";
+        String expectedResult = "{\"_type\":\"relationType\",\"columns\":[{\"genericType\":{\"multiplicityArguments\":[],\"rawType\":{\"_type\":\"packageableType\",\"fullPath\":\"String\"},\"typeArguments\":[],\"typeVariableValues\":[]},\"multiplicity\":{\"lowerBound\":0,\"upperBound\":1},\"name\":\"FIRSTNAME\"},{\"genericType\":{\"multiplicityArguments\":[],\"rawType\":{\"_type\":\"packageableType\",\"fullPath\":\"String\"},\"typeArguments\":[],\"typeVariableValues\":[]},\"multiplicity\":{\"lowerBound\":0,\"upperBound\":1},\"name\":\"LASTNAME\"},{\"genericType\":{\"multiplicityArguments\":[],\"rawType\":{\"_type\":\"packageableType\",\"fullPath\":\"String\"},\"typeArguments\":[],\"typeVariableValues\":[]},\"multiplicity\":{\"lowerBound\":1,\"upperBound\":1},\"name\":\"newCol\"},{\"genericType\":{\"multiplicityArguments\":[],\"rawType\":{\"_type\":\"packageableType\",\"fullPath\":\"String\"},\"typeArguments\":[],\"typeVariableValues\":[]},\"multiplicity\":{\"lowerBound\":1,\"upperBound\":1},\"name\":\"colX\"}]}";
         testExtractRelationReturnType(expectedResult, lambda, null);
     }
 

diff --git a/.../main/java/org/finos/legend/engine/language/pure/compiler/toPureGraph/CompileContext.java b/.../main/java/org/finos/legend/engine/language/pure/compiler/toPureGraph/CompileContext.java
@@ -29,7 +29,7 @@
 import org.finos.legend.engine.protocol.pure.v1.model.SourceInformation;
 import org.finos.legend.engine.protocol.pure.v1.model.context.EngineErrorType;
 import org.finos.legend.engine.protocol.pure.v1.model.context.PackageableElementPointer;
-import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
+import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
 import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.domain.StereotypePtr;
 import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.domain.TagPtr;
 import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.section.ImportAwareCodeSection;
@@ -165,6 +165,12 @@ public Builder withSection(Section section)
             return this;
         }
 
+        public Builder withImports(ImmutableSet<String> extraImports)
+        {
+            this.imports = META_IMPORTS.newWithAll(extraImports);
+            return this;
+        }
+
         public CompileContext build()
         {
             return new CompileContext(this);
@@ -186,7 +192,7 @@ public Processor<?> getExtraProcessorOrThrow(PackageableElement element)
         return getCompilerExtensions().getExtraProcessorOrThrow(element);
     }
 
-    public org.finos.legend.pure.m3.coreinstance.meta.pure.metamodel.PackageableElement processFirstPass(org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement element)
+    public org.finos.legend.pure.m3.coreinstance.meta.pure.metamodel.PackageableElement processFirstPass(PackageableElement element)
     {
         org.finos.legend.pure.m3.coreinstance.meta.pure.metamodel.PackageableElement pureElement = getExtraProcessorOrThrow(element).processFirstPass(element, this);
         if (pureElement instanceof ConcreteFunctionDefinition<?>)
@@ -196,17 +202,17 @@ public org.finos.legend.pure.m3.coreinstance.meta.pure.metamodel.PackageableElem
         return this.pureModel.setNameAndPackage(pureElement, element.name, element._package, element.sourceInformation);
     }
 
-    public void processSecondPass(org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement element)
+    public void processSecondPass(PackageableElement element)
     {
         getExtraProcessorOrThrow(element).processSecondPass(element, this);
     }
 
-    protected RichIterable<? extends org.finos.legend.pure.m3.coreinstance.meta.pure.metamodel.PackageableElement> processPrerequisiteElementsPass(org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement element)
+    protected RichIterable<? extends org.finos.legend.pure.m3.coreinstance.meta.pure.metamodel.PackageableElement> processPrerequisiteElementsPass(PackageableElement element)
     {
         return getExtraProcessorOrThrow(element).getPrerequisiteElements(element, this);
     }
 
-    public void processThirdPass(org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement element)
+    public void processThirdPass(PackageableElement element)
     {
         getExtraProcessorOrThrow(element).processThirdPass(element, this);
     }

diff --git a/...java/org/finos/legend/engine/language/pure/compiler/toPureGraph/DependencyManagement.java b/...java/org/finos/legend/engine/language/pure/compiler/toPureGraph/DependencyManagement.java
@@ -25,7 +25,7 @@
 import org.eclipse.collections.impl.multimap.list.FastListMultimap;
 import org.eclipse.collections.impl.tuple.Tuples;
 import org.finos.legend.engine.protocol.pure.v1.model.context.EngineErrorType;
-import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement;
+import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
 import org.finos.legend.engine.shared.core.operational.errorManagement.EngineException;
 
 import java.lang.reflect.Modifier;
@@ -134,9 +134,9 @@ public void detectCircularDependency()
         }
     }
 
-    public FastListMultimap<java.lang.Class<? extends org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement>, PackageableElementsByDependencyLevel> topologicallySortElements(FastListMultimap<java.lang.Class<? extends org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement>, PackageableElementsByDependencyLevel> classToElements, MutableMap<java.lang.Class<? extends org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement>, MutableMap<String, MutableSet<String>>> elementPrerequisitesByClass)
+    public FastListMultimap<java.lang.Class<? extends PackageableElement>, PackageableElementsByDependencyLevel> topologicallySortElements(FastListMultimap<java.lang.Class<? extends PackageableElement>, PackageableElementsByDependencyLevel> classToElements, MutableMap<java.lang.Class<? extends PackageableElement>, MutableMap<String, MutableSet<String>>> elementPrerequisitesByClass)
     {
-        FastListMultimap<java.lang.Class<? extends org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement>, PackageableElementsByDependencyLevel> classToElementsSortedByDependencyLevel = new FastListMultimap<>();
+        FastListMultimap<java.lang.Class<? extends PackageableElement>, PackageableElementsByDependencyLevel> classToElementsSortedByDependencyLevel = new FastListMultimap<>();
         classToElements.forEachKeyMultiValues((clazz, elementsByDependencyLevel) ->
         {
             if (elementPrerequisitesByClass.containsKey(clazz))
@@ -359,7 +359,7 @@ protected PackageableElementsByDependencyLevel(Collection<Pair<PackageableElemen
             this.independentElementAndPathPairs = Lists.fixedSize.withAll(packageableElementAndPathPairs);
         }
 
-        protected FixedSizeList<Pair<org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement, String>> getIndependentElementAndPathPairs()
+        protected FixedSizeList<Pair<PackageableElement, String>> getIndependentElementAndPathPairs()
         {
             return this.independentElementAndPathPairs;
         }

diff --git a/...d/engine/language/pure/compiler/toPureGraph/PackageableElementMilestoningPassBuilder.java b/...d/engine/language/pure/compiler/toPureGraph/PackageableElementMilestoningPassBuilder.java
@@ -41,7 +41,7 @@ public PackageableElementMilestoningPassBuilder(CompileContext context)
     }
 
     @Override
-    public PackageableElement visit(org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement element)
+    public PackageableElement visit(org.finos.legend.engine.protocol.pure.v1.model.PackageableElement element)
     {
         return null;
     }