Skip to content

remove MeasureAggregatorType use string it need for custom aggregators #255

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

Open
dbulahov wants to merge 1 commit into
base: main
Choose a base branch
from
+132 −267
Open

remove MeasureAggregatorType use string it need for custom aggregators #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions api/src/main/java/org/eclipse/daanse/rolap/mapping/api/model/MeasureMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
package org.eclipse.daanse.rolap.mapping.api.model;

import org.eclipse.daanse.rolap.mapping.api.model.enums.InternalDataType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.MeasureAggregatorType;

public interface MeasureMapping extends MemberMapping{

Expand All @@ -23,7 +22,7 @@ public interface MeasureMapping extends MemberMapping{

InternalDataType getDatatype();

MeasureAggregatorType getAggregatorType();
String getAggregatorType();

MeasureGroupMapping getMeasureGroup();

Expand Down
39 changes: 0 additions & 39 deletions ...src/main/java/org/eclipse/daanse/rolap/mapping/api/model/enums/MeasureAggregatorType.java
View file
Open in desktop

This file was deleted.

17 changes: 1 addition & 16 deletions emf/src/main/resources/model/org.eclipse.daanse.rolap.mapping.ecore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,17 +144,12 @@
<details key="body" value="return InternalDataType.fromValue(getDataType().getLiteral());"/>
</eAnnotations>
</eOperations>
<eOperations name="getAggregatorType" lowerBound="1" eType="#//MeasureAggregatorType">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="body" value="return MeasureAggregatorType.fromValue(getAggregator().getLiteral());"/>
</eAnnotations>
</eOperations>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="backColor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="column" lowerBound="1"
eType="#//Column"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="dataType" eType="#//ColumnInternalDataType"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="formatter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="aggregator" eType="#//MeasureAggregator"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="aggregatorType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="measureGroup" lowerBound="1"
eType="#//MeasureGroup" eOpposite="#//MeasureGroup/measures"/>
</eClassifiers>
Expand Down Expand Up @@ -866,15 +861,6 @@
<eLiterals name="PARTIAL" value="1" literal="partial"/>
<eLiterals name="HIDDEN" value="3" literal="hidden"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="MeasureAggregator">
<eLiterals name="NONE" literal="None"/>
<eLiterals name="SUM" value="1" literal="sum"/>
<eLiterals name="COUNT" value="2" literal="count"/>
<eLiterals name="MIN" value="3" literal="min"/>
<eLiterals name="MAX" value="4" literal="max"/>
<eLiterals name="AVG" value="5" literal="avg"/>
<eLiterals name="DICTINCT_COUNT" value="6" literal="distinct-count"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="ColumnInternalDataType">
<eLiterals name="STRING" literal="String"/>
<eLiterals name="NUMERIC" value="1" literal="Numeric"/>
Expand Down Expand Up @@ -1104,6 +1090,5 @@
<eClassifiers xsi:type="ecore:EDataType" name="HideMemberIfType" instanceClassName="org.eclipse.daanse.rolap.mapping.api.model.enums.HideMemberIfType"/>
<eClassifiers xsi:type="ecore:EDataType" name="LevelType" instanceClassName="org.eclipse.daanse.rolap.mapping.api.model.enums.LevelType"/>
<eClassifiers xsi:type="ecore:EDataType" name="RollupPolicyType" instanceClassName="org.eclipse.daanse.rolap.mapping.api.model.enums.RollupPolicyType"/>
<eClassifiers xsi:type="ecore:EDataType" name="MeasureAggregatorType" instanceClassName="org.eclipse.daanse.rolap.mapping.api.model.enums.MeasureAggregatorType"/>
<eClassifiers xsi:type="ecore:EDataType" name="ColumnDataType" instanceClassName="org.eclipse.daanse.rolap.mapping.api.model.enums.ColumnDataType"/>
</ecore:EPackage>
14 changes: 1 addition & 13 deletions emf/src/main/resources/model/org.eclipse.daanse.rolap.mapping.genmodel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,6 @@
<genEnumLiterals ecoreEnumLiteral="org.eclipse.daanse.rolap.mapping.ecore#//RollupPolicy/PARTIAL"/>
<genEnumLiterals ecoreEnumLiteral="org.eclipse.daanse.rolap.mapping.ecore#//RollupPolicy/HIDDEN"/>
</genEnums>
<genEnums typeSafeEnumCompatible="false" ecoreEnum="org.eclipse.daanse.rolap.mapping.ecore#//MeasureAggregator">
<genEnumLiterals ecoreEnumLiteral="org.eclipse.daanse.rolap.mapping.ecore#//MeasureAggregator/NONE"/>
<genEnumLiterals ecoreEnumLiteral="org.eclipse.daanse.rolap.mapping.ecore#//MeasureAggregator/SUM"/>
<genEnumLiterals ecoreEnumLiteral="org.eclipse.daanse.rolap.mapping.ecore#//MeasureAggregator/COUNT"/>
<genEnumLiterals ecoreEnumLiteral="org.eclipse.daanse.rolap.mapping.ecore#//MeasureAggregator/MIN"/>
<genEnumLiterals ecoreEnumLiteral="org.eclipse.daanse.rolap.mapping.ecore#//MeasureAggregator/MAX"/>
<genEnumLiterals ecoreEnumLiteral="org.eclipse.daanse.rolap.mapping.ecore#//MeasureAggregator/AVG"/>
<genEnumLiterals ecoreEnumLiteral="org.eclipse.daanse.rolap.mapping.ecore#//MeasureAggregator/DICTINCT_COUNT"/>
</genEnums>
<genEnums typeSafeEnumCompatible="false" ecoreEnum="org.eclipse.daanse.rolap.mapping.ecore#//ColumnInternalDataType">
<genEnumLiterals ecoreEnumLiteral="org.eclipse.daanse.rolap.mapping.ecore#//ColumnInternalDataType/STRING"/>
<genEnumLiterals ecoreEnumLiteral="org.eclipse.daanse.rolap.mapping.ecore#//ColumnInternalDataType/NUMERIC"/>
Expand Down Expand Up @@ -156,7 +147,6 @@
<genDataTypes ecoreDataType="org.eclipse.daanse.rolap.mapping.ecore#//HideMemberIfType"/>
<genDataTypes ecoreDataType="org.eclipse.daanse.rolap.mapping.ecore#//LevelType"/>
<genDataTypes ecoreDataType="org.eclipse.daanse.rolap.mapping.ecore#//RollupPolicyType"/>
<genDataTypes ecoreDataType="org.eclipse.daanse.rolap.mapping.ecore#//MeasureAggregatorType"/>
<genDataTypes ecoreDataType="org.eclipse.daanse.rolap.mapping.ecore#//ColumnDataType"/>
<genClasses ecoreClass="org.eclipse.daanse.rolap.mapping.ecore#//Documentation">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.daanse.rolap.mapping.ecore#//Documentation/title"/>
Expand Down Expand Up @@ -243,12 +233,10 @@
<genFeatures createChild="false" ecoreFeature="ecore:EReference org.eclipse.daanse.rolap.mapping.ecore#//Measure/column"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.daanse.rolap.mapping.ecore#//Measure/dataType"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.daanse.rolap.mapping.ecore#//Measure/formatter"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.daanse.rolap.mapping.ecore#//Measure/aggregator"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.daanse.rolap.mapping.ecore#//Measure/aggregatorType"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference org.eclipse.daanse.rolap.mapping.ecore#//Measure/measureGroup"/>
<genOperations ecoreOperation="org.eclipse.daanse.rolap.mapping.ecore#//Measure/getDatatype"
body="return InternalDataType.fromValue(getDataType().getLiteral());"/>
<genOperations ecoreOperation="org.eclipse.daanse.rolap.mapping.ecore#//Measure/getAggregatorType"
body="return MeasureAggregatorType.fromValue(getAggregator().getLiteral());"/>
</genClasses>
<genClasses ecoreClass="org.eclipse.daanse.rolap.mapping.ecore#//Kpi">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.daanse.rolap.mapping.ecore#//Kpi/translations"/>
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/org/eclipse/daanse/rolap/mapping/emf/rolapmapping/ResourceSetWriteReadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ public void writePopulation(@InjectBundleContext BundleContext bc,

MeasureGroup measureGroup = RolapMappingFactory.eINSTANCE.createMeasureGroup();
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
measure.setAggregator(MeasureAggregator.SUM);
measure.setAggregatorType("sum");
measure.setName("Einwohnerzahl");
measure.setColumn(columnEinwohnerAnzahl);
measureGroup.getMeasures().add(measure);
Expand Down
9 changes: 4 additions & 5 deletions ...in/java/org/eclipse/daanse/rolap/mapping/instance/emf/complex/school/CatalogSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.JoinedQueryElement;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
Expand Down Expand Up @@ -1031,25 +1030,25 @@ public CatalogMapping get() {
measure1.setName("Anzahl Schulen");
measure1.setId("M_Anzahl_Schulen");
measure1.setColumn(ANZAHL_SCHULEN_COLUMN_IN_FACT_SCHULEN);
measure1.setAggregator(MeasureAggregator.SUM);
measure1.setAggregatorType("sum");

Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
measure2.setName("Anzahl Klassen");
measure2.setId("M_Anzahl_Klassen");
measure2.setColumn(ANZAHL_KLASSEN_COLUMN_IN_FACT_SCHULEN);
measure2.setAggregator(MeasureAggregator.SUM);
measure2.setAggregatorType("sum");

Measure measure3 = RolapMappingFactory.eINSTANCE.createMeasure();
measure3.setName("Anzahl Personen");
measure3.setId("M_Anzahl_Personen");
measure3.setColumn(ANZAHL_PERSONEN_COLUMN_IN_FACT_PERSONAL);
measure3.setAggregator(MeasureAggregator.SUM);
measure3.setAggregatorType("sum");

Measure measure4 = RolapMappingFactory.eINSTANCE.createMeasure();
measure4.setName("Anzahl Schüler:innen");
measure4.setId("M_Anzahl_Schuler_innen");
measure4.setColumn(ANZAHL_SCHUELER_COLUMN_IN_FACT_SCHUELER);
measure4.setAggregator(MeasureAggregator.SUM);
measure4.setAggregatorType("sum");

MeasureGroup CUBE1_MEASURE_GROUP = RolapMappingFactory.eINSTANCE.createMeasureGroup();
CUBE1_MEASURE_GROUP.getMeasures().addAll(List.of(measure1, measure2));
Expand Down
3 changes: 1 addition & 2 deletions ...lipse/daanse/rolap/mapping/instance/emf/tutorial/accessallnonecustom/CatalogSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.HierarchyAccess;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MemberAccess;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
Expand Down Expand Up @@ -88,7 +87,7 @@ public CatalogMapping get() {
query.setTable(table);

Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
measure1.setAggregator(MeasureAggregator.SUM);
measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valueColumn);
Expand Down
3 changes: 1 addition & 2 deletions ...g/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accesscubegrand/CatalogSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
Expand Down Expand Up @@ -80,7 +79,7 @@ public CatalogMapping get() {
query.setTable(table);

Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
measure1.setAggregator(MeasureAggregator.SUM);
measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valueColumn);
Expand Down
3 changes: 1 addition & 2 deletions ...lipse/daanse/rolap/mapping/instance/emf/tutorial/accessdbschemagrand/CatalogSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchemaAccess;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Documentation;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
Expand Down Expand Up @@ -96,7 +95,7 @@ public CatalogMapping get() {
query.setTable(table);

Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
measure1.setAggregator(MeasureAggregator.SUM);
measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valueColumn);
Expand Down
3 changes: 1 addition & 2 deletions ...ipse/daanse/rolap/mapping/instance/emf/tutorial/accesshierarchygrand/CatalogSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.HierarchyAccess;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MemberAccess;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
Expand Down Expand Up @@ -86,7 +85,7 @@ public CatalogMapping get() {
query.setTable(table);

Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
measure1.setAggregator(MeasureAggregator.SUM);
measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valueColumn);
Expand Down
3 changes: 1 addition & 2 deletions ...eclipse/daanse/rolap/mapping/instance/emf/tutorial/accessschemagrand/CatalogSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
Expand Down Expand Up @@ -78,7 +77,7 @@ public CatalogMapping get() {
query.setTable(table);

Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
measure1.setAggregator(MeasureAggregator.SUM);
measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valueColumn);
Expand Down
3 changes: 1 addition & 2 deletions ...va/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/aggexclude/CatalogSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Documentation;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
Expand Down Expand Up @@ -91,7 +90,7 @@ public CatalogMapping get() {
query.getAggregationExcludes().add(aggregationExclude);

Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
measure.setAggregator(MeasureAggregator.SUM);
measure.setAggregatorType("sum");
measure.setName("Measure");
measure.setId("Measure");
measure.setColumn(valueColumn);
Expand Down
3 changes: 1 addition & 2 deletions ...g/eclipse/daanse/rolap/mapping/instance/emf/tutorial/aggregatetables/CatalogSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.JoinedQueryElement;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
Expand Down Expand Up @@ -214,7 +213,7 @@ public CatalogMapping get() {
joinQuery.setRight(right);

Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
measure.setAggregator(MeasureAggregator.SUM);
measure.setAggregatorType("sum");
measure.setName("Store Cost");
measure.setId("Store Cost");
measure.setColumn(storeCostColumn);
Expand Down
3 changes: 1 addition & 2 deletions ...org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cellformatter/CatalogSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Documentation;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
Expand Down Expand Up @@ -71,7 +70,7 @@ public CatalogMapping get() {
cellFormatter.setRef("mondrian.rolap.format.CellFormatterImpl");

Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
measure1.setAggregator(MeasureAggregator.SUM);
measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valueColumn);
Expand Down
5 changes: 2 additions & 3 deletions ...anse/rolap/mapping/instance/emf/tutorial/cube/calculatedmember/intro/CatalogSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
Expand Down Expand Up @@ -122,13 +121,13 @@ public CatalogMapping get() {
dimensionConnector.setDimension(dimension);

Measure measureSum = RolapMappingFactory.eINSTANCE.createMeasure();
measureSum.setAggregator(MeasureAggregator.SUM);
measureSum.setAggregatorType("sum");
measureSum.setName("Measure1-Sum");
measureSum.setId("Measure1-Sum");
measureSum.setColumn(valueColumn);

Measure measureCount = RolapMappingFactory.eINSTANCE.createMeasure();
measureCount.setAggregator(MeasureAggregator.COUNT);
measureCount.setAggregatorType("count");
measureCount.setName("Measure2-Count");
measureCount.setId("Measure2-Count");
measureCount.setColumn(valueColumn);
Expand Down
3 changes: 1 addition & 2 deletions ...ipse/daanse/rolap/mapping/instance/emf/tutorial/cube/dimension/intro/CatalogSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
Expand Down Expand Up @@ -104,7 +103,7 @@ public CatalogMapping get() {
query.setTable(table);

Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
measure.setAggregator(MeasureAggregator.SUM);
measure.setAggregatorType("sum");
measure.setName("theMeasure");
measure.setId("_measure");
measure.setColumn(valueColumn);
Expand Down
Loading
Loading