Skip to content

Commit d398bc9

Browse files
committed
better order of tutorial xmi files
Signed-off-by: Stefan Bischof <[email protected]>
1 parent 132d961 commit d398bc9

File tree

48 files changed

+292
-292
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+292
-292
lines changed

docs/cubeserver/tutorial/complex.school.md

Lines changed: 75 additions & 75 deletions
Large diffs are not rendered by default.

docs/cubeserver/tutorial/tutorial.access.cataloggrand.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ This files represent the complete definition of the catalog.
145145
```xml
146146
<?xml version="1.0" encoding="UTF-8"?>
147147
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:roma="https://www.daanse.org/spec/org.eclipse.daanse.rolap.mapping">
148-
<roma:ExplicitHierarchy id="_hierarchy_main" name="Hierarchy1" hasAll="false" primaryKey="_column_fact_key" query="_query_fact" levels="_level_key"/>
149148
<roma:Catalog description="Demonstrates access control with catalog grants and roles" name="Daanse Tutorial - Access Catalog Grant" cubes="_cube_main" accessRoles="_accessRole_all _accessRole_none _accessRole_allDimWithCubeGrand _accessRole_allDimWithoutCubeGrand" dbschemas="_databaseSchema_CatalogGrand"/>
150149
<roma:DatabaseSchema id="_databaseSchema_CatalogGrand">
151150
<tables xsi:type="roma:PhysicalTable" id="_table_fact" name="Fact">
@@ -155,6 +154,7 @@ This files represent the complete definition of the catalog.
155154
</roma:DatabaseSchema>
156155
<roma:TableQuery id="_query_fact" table="_table_fact"/>
157156
<roma:Level id="_level_key" name="Level1" column="_column_fact_key"/>
157+
<roma:ExplicitHierarchy id="_hierarchy_main" name="Hierarchy1" hasAll="false" primaryKey="_column_fact_key" query="_query_fact" levels="_level_key"/>
158158
<roma:StandardDimension id="_dimension_main" name="Dimension1" hierarchies="_hierarchy_main"/>
159159
<roma:PhysicalCube id="_cube_main" name="Cube1" query="_query_fact">
160160
<dimensionConnectors foreignKey="_column_fact_key" dimension="_dimension_main" overrideDimensionName="Dimension1" id="_dimensionConnector_main"/>
@@ -163,22 +163,22 @@ This files represent the complete definition of the catalog.
163163
<measures xsi:type="roma:SumMeasure" id="_measure_sum" name="Measure1" column="_column_fact_value"/>
164164
</measureGroups>
165165
</roma:PhysicalCube>
166+
<roma:AccessRole id="_accessRole_all" name="roleAll">
167+
<accessCatalogGrants catalogAccess="all"/>
168+
</roma:AccessRole>
166169
<roma:AccessRole id="_accessRole_allDimWithCubeGrand" name="roleAllDimWithCubeGrand">
167170
<accessCatalogGrants catalogAccess="all_dimensions">
168171
<cubeGrants cubeAccess="all" cube="_cube_main"/>
169172
</accessCatalogGrants>
170173
</roma:AccessRole>
171-
<roma:AccessRole id="_accessRole_all" name="roleAll">
172-
<accessCatalogGrants catalogAccess="all"/>
173-
</roma:AccessRole>
174-
<roma:AccessRole id="_accessRole_none" name="roleNone">
175-
<accessCatalogGrants/>
176-
</roma:AccessRole>
177174
<roma:AccessRole id="_accessRole_allDimWithoutCubeGrand" name="roleAllDimWithoutCubeGrand">
178175
<accessCatalogGrants catalogAccess="all_dimensions">
179176
<databaseSchemaGrants databaseSchemaAccess="all" databaseSchema="_databaseSchema_CatalogGrand"/>
180177
</accessCatalogGrants>
181178
</roma:AccessRole>
179+
<roma:AccessRole id="_accessRole_none" name="roleNone">
180+
<accessCatalogGrants/>
181+
</roma:AccessRole>
182182
</xmi:XMI>
183183

184184
```

docs/cubeserver/tutorial/tutorial.access.columngrand.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,23 +111,23 @@ This files represent the complete definition of the catalog.
111111
<measures xsi:type="roma:SumMeasure" id="_measure_sum" name="Measure1" column="_column_fact_value"/>
112112
</measureGroups>
113113
</roma:PhysicalCube>
114-
<roma:AccessRole id="_accessRole_none" name="roleNone">
114+
<roma:AccessRole id="_accessRole_all" name="roleAll">
115115
<accessCatalogGrants catalogAccess="all">
116116
<cubeGrants cubeAccess="all" cube="_cube_main"/>
117117
<databaseSchemaGrants databaseSchemaAccess="custom" databaseSchema="_databaseSchema_ColumnGrand">
118118
<tableGrants tableAccess="custom" table="_table_fact">
119-
<columnGrants column="_column_fact_value"/>
119+
<columnGrants columnAccess="all" column="_column_fact_value"/>
120+
<columnGrants columnAccess="all" column="_column_fact_key"/>
120121
</tableGrants>
121122
</databaseSchemaGrants>
122123
</accessCatalogGrants>
123124
</roma:AccessRole>
124-
<roma:AccessRole id="_accessRole_all" name="roleAll">
125+
<roma:AccessRole id="_accessRole_none" name="roleNone">
125126
<accessCatalogGrants catalogAccess="all">
126127
<cubeGrants cubeAccess="all" cube="_cube_main"/>
127128
<databaseSchemaGrants databaseSchemaAccess="custom" databaseSchema="_databaseSchema_ColumnGrand">
128129
<tableGrants tableAccess="custom" table="_table_fact">
129-
<columnGrants columnAccess="all" column="_column_fact_value"/>
130-
<columnGrants columnAccess="all" column="_column_fact_key"/>
130+
<columnGrants column="_column_fact_value"/>
131131
</tableGrants>
132132
</databaseSchemaGrants>
133133
</accessCatalogGrants>

docs/cubeserver/tutorial/tutorial.access.cubegrand.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ This files represent the complete definition of the catalog.
120120
```xml
121121
<?xml version="1.0" encoding="UTF-8"?>
122122
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:roma="https://www.daanse.org/spec/org.eclipse.daanse.rolap.mapping">
123-
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy1" name="Hierarchy1" hasAll="false" primaryKey="_column_fact_key" query="_query_factQuery" levels="_level_Level1"/>
124123
<roma:Catalog description="Access control with cube-level grants" name="Daanse Tutorial - Access Cube Grant" cubes="_cube_Cube1 _cube_Cube2" accessRoles="_accessRole_role1" dbschemas="_databaseSchema_CubeGrand"/>
125124
<roma:DatabaseSchema id="_databaseSchema_CubeGrand">
126125
<tables xsi:type="roma:PhysicalTable" id="_table_fact" name="Fact">
@@ -130,6 +129,7 @@ This files represent the complete definition of the catalog.
130129
</roma:DatabaseSchema>
131130
<roma:TableQuery id="_query_factQuery" table="_table_fact"/>
132131
<roma:Level id="_level_Level1" name="Level1" column="_column_fact_key"/>
132+
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy1" name="Hierarchy1" hasAll="false" primaryKey="_column_fact_key" query="_query_factQuery" levels="_level_Level1"/>
133133
<roma:StandardDimension id="_dimension_Dimension1" name="Dimension1" hierarchies="_hierarchy_Hierarchy1"/>
134134
<roma:PhysicalCube id="_cube_Cube1" name="Cube1" query="_query_factQuery">
135135
<dimensionConnectors foreignKey="_column_fact_key" dimension="_dimension_Dimension1" overrideDimensionName="Dimension1" id="_dimensionConnector_dimension11"/>

docs/cubeserver/tutorial/tutorial.access.dimensiongrand.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ This files represent the complete definition of the catalog.
109109
```xml
110110
<?xml version="1.0" encoding="UTF-8"?>
111111
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:roma="https://www.daanse.org/spec/org.eclipse.daanse.rolap.mapping">
112-
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy2" name="Hierarchy2" hasAll="false" primaryKey="_column_fact_key" query="_query_factQuery" levels="_level_Level2"/>
113-
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy1" name="Hierarchy1" hasAll="false" primaryKey="_column_fact_key" query="_query_factQuery" levels="_level_Level1"/>
114112
<roma:Catalog description="Access control with dimension-level grants" name="Daanse Tutorial - Access Dimension Grant" cubes="_cube_Cube1" accessRoles="_accessRole_role1" dbschemas="_databaseSchema_DimensionGrand"/>
115113
<roma:DatabaseSchema id="_databaseSchema_DimensionGrand">
116114
<tables xsi:type="roma:PhysicalTable" id="_table_fact" name="Fact">
@@ -119,10 +117,12 @@ This files represent the complete definition of the catalog.
119117
</tables>
120118
</roma:DatabaseSchema>
121119
<roma:TableQuery id="_query_factQuery" table="_table_fact"/>
122-
<roma:Level id="_level_Level2" name="Level2" column="_column_fact_key"/>
123120
<roma:Level id="_level_Level1" name="Level1" column="_column_fact_key"/>
124-
<roma:StandardDimension id="_dimension_Dimension2" name="Dimension2" hierarchies="_hierarchy_Hierarchy2"/>
121+
<roma:Level id="_level_Level2" name="Level2" column="_column_fact_key"/>
122+
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy1" name="Hierarchy1" hasAll="false" primaryKey="_column_fact_key" query="_query_factQuery" levels="_level_Level1"/>
123+
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy2" name="Hierarchy2" hasAll="false" primaryKey="_column_fact_key" query="_query_factQuery" levels="_level_Level2"/>
125124
<roma:StandardDimension id="_dimension_Dimension1" name="Dimension1" hierarchies="_hierarchy_Hierarchy1"/>
125+
<roma:StandardDimension id="_dimension_Dimension2" name="Dimension2" hierarchies="_hierarchy_Hierarchy2"/>
126126
<roma:PhysicalCube id="_cube_Cube1" name="Cube1" query="_query_factQuery">
127127
<dimensionConnectors foreignKey="_column_fact_key" dimension="_dimension_Dimension1" overrideDimensionName="Dimension1" id="_dimensionConnector_dimension1"/>
128128
<dimensionConnectors foreignKey="_column_fact_key" dimension="_dimension_Dimension2" overrideDimensionName="Dimension2" id="_dimensionConnector_dimension2"/>

docs/cubeserver/tutorial/tutorial.access.hierarchygrand.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ This files represent the complete definition of the catalog.
112112
```xml
113113
<?xml version="1.0" encoding="UTF-8"?>
114114
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:roma="https://www.daanse.org/spec/org.eclipse.daanse.rolap.mapping">
115-
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy2" name="Hierarchy1" hasAll="false" primaryKey="_column_fact_key" query="_query_factQuery" levels="_level_Level2"/>
116-
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy1" name="Hierarchy1" hasAll="false" primaryKey="_column_fact_key" query="_query_factQuery" levels="_level_Level1"/>
117115
<roma:Catalog description="Access control with hierarchy-level grants" name="Daanse Tutorial - Access Hierarchy Grant" cubes="_cube_Cube1" accessRoles="_accessRole_role1" dbschemas="_databaseSchema_HierarchyGrand"/>
118116
<roma:DatabaseSchema id="_databaseSchema_HierarchyGrand">
119117
<tables xsi:type="roma:PhysicalTable" id="_table_fact" name="Fact">
@@ -124,6 +122,8 @@ This files represent the complete definition of the catalog.
124122
<roma:TableQuery id="_query_factQuery" table="_table_fact"/>
125123
<roma:Level id="_level_Level1" name="Level1" column="_column_fact_key"/>
126124
<roma:Level id="_level_Level2" name="Level2" column="_column_fact_key"/>
125+
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy1" name="Hierarchy1" hasAll="false" primaryKey="_column_fact_key" query="_query_factQuery" levels="_level_Level1"/>
126+
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy2" name="Hierarchy1" hasAll="false" primaryKey="_column_fact_key" query="_query_factQuery" levels="_level_Level2"/>
127127
<roma:StandardDimension id="_dimension_Dimension1" name="Dimension1" hierarchies="_hierarchy_Hierarchy1 _hierarchy_Hierarchy2"/>
128128
<roma:PhysicalCube id="_cube_Cube1" name="Cube1" query="_query_factQuery">
129129
<dimensionConnectors foreignKey="_column_fact_key" dimension="_dimension_Dimension1" overrideDimensionName="Dimension1" id="_dimensionConnector_dimension1"/>

docs/cubeserver/tutorial/tutorial.access.membergrand.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ This files represent the complete definition of the catalog.
126126
```xml
127127
<?xml version="1.0" encoding="UTF-8"?>
128128
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:roma="https://www.daanse.org/spec/org.eclipse.daanse.rolap.mapping">
129-
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy1" name="Hierarchy1" hasAll="false" primaryKey="_column_fact_key" query="_query_factQuery" levels="_level_Level1"/>
130129
<roma:Catalog description="Access control with member-level grants" name="Daanse Tutorial - Access Member Grant" cubes="_cube_Cube1" accessRoles="_accessRole_role1" dbschemas="_databaseSchema_MemberGrand"/>
131130
<roma:DatabaseSchema id="_databaseSchema_MemberGrand">
132131
<tables xsi:type="roma:PhysicalTable" id="_table_fact" name="Fact">
@@ -136,6 +135,7 @@ This files represent the complete definition of the catalog.
136135
</roma:DatabaseSchema>
137136
<roma:TableQuery id="_query_factQuery" table="_table_fact"/>
138137
<roma:Level id="_level_Level1" name="Level1" column="_column_fact_key"/>
138+
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy1" name="Hierarchy1" hasAll="false" primaryKey="_column_fact_key" query="_query_factQuery" levels="_level_Level1"/>
139139
<roma:StandardDimension id="_dimension_Dimension1" name="Dimension1" hierarchies="_hierarchy_Hierarchy1"/>
140140
<roma:PhysicalCube id="_cube_Cube1" name="Cube1" query="_query_factQuery">
141141
<dimensionConnectors foreignKey="_column_fact_key" dimension="_dimension_Dimension1" overrideDimensionName="Dimension1" id="_dimensionConnector_dimension11"/>

docs/cubeserver/tutorial/tutorial.action.drillthrough.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ The Query is a simple TableQuery that selects all columns from the `HX_L2` table
117117

118118
```
119119
*<small>Note: This is only a symbolic example. For the exact definition, see the [Definition](#definition) section.</small>*
120-
## Level4
120+
## Level1
121121

122-
This Example uses H2_Level2 level bases on the KEY column as kew and NAME column as name from HX_L2 table.
122+
This Example uses H1_Level1 level bases on the `KEY` column as kew and `NAME` column as name from `H1_L1` table.
123123

124124

125125
```xml
126-
<roma:Level id="_level_H2_Level2" name="H2_Level2" column="_column_hx_l2_key" nameColumn="_column_hx_l2_name"/>
126+
<roma:Level id="_level_H1_Level1" name="H1_Level1" column="_column_h1_l1_key" nameColumn="_column_h1_l1_name"/>
127127

128128
```
129129
*<small>Note: This is only a symbolic example. For the exact definition, see the [Definition](#definition) section.</small>*
@@ -147,13 +147,13 @@ This Example uses H2_Level1 level bases on the KEY column as kew and NAME column
147147

148148
```
149149
*<small>Note: This is only a symbolic example. For the exact definition, see the [Definition](#definition) section.</small>*
150-
## Level1
150+
## Level4
151151

152-
This Example uses H1_Level1 level bases on the `KEY` column as kew and `NAME` column as name from `H1_L1` table.
152+
This Example uses H2_Level2 level bases on the KEY column as kew and NAME column as name from HX_L2 table.
153153

154154

155155
```xml
156-
<roma:Level id="_level_H1_Level1" name="H1_Level1" column="_column_h1_l1_key" nameColumn="_column_h1_l1_name"/>
156+
<roma:Level id="_level_H2_Level2" name="H2_Level2" column="_column_hx_l2_key" nameColumn="_column_hx_l2_name"/>
157157

158158
```
159159
*<small>Note: This is only a symbolic example. For the exact definition, see the [Definition](#definition) section.</small>*
@@ -175,16 +175,6 @@ The Hierarchy1 is defined with the hasAll property set to false and the two leve
175175
```xml
176176
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy2" name="Hierarchy2" primaryKey="_column_hx_l2_key" query="_joinQuery_join2" levels="_level_H2_Level1 _level_H2_Level2"/>
177177

178-
```
179-
*<small>Note: This is only a symbolic example. For the exact definition, see the [Definition](#definition) section.</small>*
180-
## DrillthroughH2L1
181-
182-
DrillThroughAttribute have reference to H2_Level1 level from Hierarchy2; H2_L1 table KEY and NAME column
183-
184-
185-
```xml
186-
<roma:DrillThroughAction id="_drillThroughAction_DrillthroughH2L1" name="DrillthroughH2L1" drillThroughMeasure="roma:SumMeasure _measure_Measure1"/>
187-
188178
```
189179
*<small>Note: This is only a symbolic example. For the exact definition, see the [Definition](#definition) section.</small>*
190180
## DrillthroughH1L1
@@ -201,6 +191,16 @@ DrillThroughAttribute have reference to H1_Level1 level from Hierarchy1; H1_L1 t
201191
```xml
202192
<roma:DrillThroughAction id="_drillThroughAction_DrillthroughH1L1" name="DrillthroughH1L1" drillThroughMeasure="roma:SumMeasure _measure_Measure1" default="true"/>
203193

194+
```
195+
*<small>Note: This is only a symbolic example. For the exact definition, see the [Definition](#definition) section.</small>*
196+
## DrillthroughH2L1
197+
198+
DrillThroughAttribute have reference to H2_Level1 level from Hierarchy2; H2_L1 table KEY and NAME column
199+
200+
201+
```xml
202+
<roma:DrillThroughAction id="_drillThroughAction_DrillthroughH2L1" name="DrillthroughH2L1" drillThroughMeasure="roma:SumMeasure _measure_Measure1"/>
203+
204204
```
205205
*<small>Note: This is only a symbolic example. For the exact definition, see the [Definition](#definition) section.</small>*
206206
## Dimension
@@ -242,8 +242,6 @@ This files represent the complete definition of the catalog.
242242
```xml
243243
<?xml version="1.0" encoding="UTF-8"?>
244244
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:roma="https://www.daanse.org/spec/org.eclipse.daanse.rolap.mapping">
245-
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy1" name="Hierarchy1" primaryKey="_column_hx_l2_key" query="_joinQuery_join1" levels="_level_H1_Level1 _level_H1_Level2"/>
246-
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy2" name="Hierarchy2" primaryKey="_column_hx_l2_key" query="_joinQuery_join2" levels="_level_H2_Level1 _level_H2_Level2"/>
247245
<roma:Catalog description="Drill-through action configuration" name="Daanse Tutorial - Action Drillthrough" cubes="_cube_Cube" dbschemas="_databaseSchema_DrillThrough"/>
248246
<roma:DatabaseSchema id="_databaseSchema_DrillThrough">
249247
<tables xsi:type="roma:PhysicalTable" id="_table_fact" name="Fact">
@@ -277,10 +275,12 @@ This files represent the complete definition of the catalog.
277275
<left key="_column_hx_l2_h2l1_key" query="_query_HxL2Query"/>
278276
<right key="_column_h2_l1_key" query="_query_H2L1Query"/>
279277
</roma:JoinQuery>
280-
<roma:Level id="_level_H2_Level2" name="H2_Level2" column="_column_hx_l2_key" nameColumn="_column_hx_l2_name"/>
278+
<roma:Level id="_level_H1_Level1" name="H1_Level1" column="_column_h1_l1_key" nameColumn="_column_h1_l1_name"/>
281279
<roma:Level id="_level_H1_Level2" name="H1_Level2" column="_column_hx_l2_key" nameColumn="_column_hx_l2_name"/>
282280
<roma:Level id="_level_H2_Level1" name="H2_Level1" column="_column_h2_l1_key" nameColumn="_column_h2_l1_name"/>
283-
<roma:Level id="_level_H1_Level1" name="H1_Level1" column="_column_h1_l1_key" nameColumn="_column_h1_l1_name"/>
281+
<roma:Level id="_level_H2_Level2" name="H2_Level2" column="_column_hx_l2_key" nameColumn="_column_hx_l2_name"/>
282+
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy1" name="Hierarchy1" primaryKey="_column_hx_l2_key" query="_joinQuery_join1" levels="_level_H1_Level1 _level_H1_Level2"/>
283+
<roma:ExplicitHierarchy id="_hierarchy_Hierarchy2" name="Hierarchy2" primaryKey="_column_hx_l2_key" query="_joinQuery_join2" levels="_level_H2_Level1 _level_H2_Level2"/>
284284
<roma:StandardDimension id="_dimension_Dimension1" name="Dimension1" hierarchies="_hierarchy_Hierarchy1 _hierarchy_Hierarchy2"/>
285285
<roma:PhysicalCube id="_cube_Cube" name="Cube" query="_query_factQuery">
286286
<dimensionConnectors foreignKey="_column_fact_key" dimension="_dimension_Dimension1" overrideDimensionName="Dimension1" id="_dimensionConnector_dimension1"/>

0 commit comments

Comments
 (0)