-
Notifications
You must be signed in to change notification settings - Fork 188
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SQALE: support for Processed Objects (squashed multiple commits)
Signed-off-by: Tony Tkacik <tonydamage@gmail.com>
- Loading branch information
1 parent
7468980
commit 67d2bca
Showing
9 changed files
with
324 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
...le/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/simulation/MProcessedObject.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package com.evolveum.midpoint.repo.sqale.qmodel.simulation; | ||
|
|
||
| import java.util.UUID; | ||
|
|
||
| import com.evolveum.midpoint.repo.sqale.qmodel.common.MContainer; | ||
| import com.evolveum.midpoint.repo.sqale.qmodel.object.MObjectType; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectProcessingStateType; | ||
|
|
||
| public class MProcessedObject extends MContainer { | ||
|
|
||
| public UUID oid; | ||
| public MObjectType objectType; | ||
| public String nameOrig; | ||
| public String nameNorm; | ||
|
|
||
| public ObjectProcessingStateType state; | ||
| public String[] metricIdentifiers; | ||
|
|
||
| public byte[] fullObject; | ||
|
|
||
| public byte[] objectBefore; | ||
| public byte[] objectAfter; | ||
|
|
||
| } |
67 changes: 67 additions & 0 deletions
67
...le/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/simulation/QProcessedObject.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| package com.evolveum.midpoint.repo.sqale.qmodel.simulation; | ||
|
|
||
| import java.sql.Types; | ||
|
|
||
| import com.evolveum.midpoint.repo.sqale.qmodel.common.QContainer; | ||
| import com.evolveum.midpoint.repo.sqale.qmodel.object.MObjectType; | ||
| import com.evolveum.midpoint.repo.sqlbase.querydsl.UuidPath; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectProcessingStateType; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultStatusType; | ||
| import com.querydsl.core.types.dsl.ArrayPath; | ||
| import com.querydsl.core.types.dsl.EnumPath; | ||
| import com.querydsl.core.types.dsl.StringPath; | ||
| import com.querydsl.sql.ColumnMetadata; | ||
|
|
||
| public class QProcessedObject extends QContainer<MProcessedObject, MSimulationResult> { | ||
|
|
||
| public static final String TABLE_NAME = "m_simulation_result_processed_object"; | ||
|
|
||
|
|
||
| public static final ColumnMetadata OID = | ||
| ColumnMetadata.named("oid").ofType(UuidPath.UUID_TYPE).notNull(); | ||
| public static final ColumnMetadata OBJECT_TYPE = | ||
| ColumnMetadata.named("objectType").ofType(Types.OTHER).notNull(); | ||
| public static final ColumnMetadata NAME_ORIG = | ||
| ColumnMetadata.named("nameOrig").ofType(Types.VARCHAR).notNull(); | ||
| public static final ColumnMetadata NAME_NORM = | ||
| ColumnMetadata.named("nameNorm").ofType(Types.VARCHAR).notNull(); | ||
| public static final ColumnMetadata STATE = | ||
| ColumnMetadata.named("state").ofType(Types.OTHER); | ||
|
|
||
| public static final ColumnMetadata FULL_OBJECT = | ||
| ColumnMetadata.named("fullObject").ofType(Types.BINARY); | ||
| public static final ColumnMetadata OBJECT_BEFORE = | ||
| ColumnMetadata.named("objectBefore").ofType(Types.BINARY); | ||
|
|
||
| public static final ColumnMetadata OBJECT_AFTER = | ||
| ColumnMetadata.named("objectAfter").ofType(Types.BINARY); | ||
|
|
||
| public static final ColumnMetadata METRIC_IDENTIFIERS = | ||
| ColumnMetadata.named("metricIdentifiers").ofType(Types.ARRAY); | ||
|
|
||
| public final UuidPath oid = createUuid("oid", OID); | ||
| public final EnumPath<MObjectType> objectType = createEnum("objectType", MObjectType.class, OBJECT_TYPE); | ||
| public final StringPath nameOrig = createString("nameOrig", NAME_ORIG); | ||
| public final StringPath nameNorm = createString("nameNorm", NAME_NORM); | ||
| public final EnumPath<ObjectProcessingStateType> state = | ||
| createEnum("outcome", ObjectProcessingStateType.class, STATE); | ||
|
|
||
| public final ArrayPath<byte[], Byte> fullObject = createByteArray("fullObject", FULL_OBJECT); | ||
| public final ArrayPath<byte[], Byte> objectBefore = createByteArray("objectBefore", OBJECT_BEFORE); | ||
| public final ArrayPath<byte[], Byte> objectAfter = createByteArray("objectAfter", OBJECT_AFTER); | ||
|
|
||
|
|
||
| public final ArrayPath<String[], String> metricIdentifiers = | ||
| createArray("metricIdentifiers", String[].class, METRIC_IDENTIFIERS); | ||
|
|
||
| public QProcessedObject(String variable) { | ||
| this(variable, DEFAULT_SCHEMA_NAME, TABLE_NAME); | ||
| } | ||
|
|
||
| public QProcessedObject(String variable, String schema, String table) { | ||
| super(MProcessedObject.class, variable, schema, table); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| } |
122 changes: 122 additions & 0 deletions
122
...main/java/com/evolveum/midpoint/repo/sqale/qmodel/simulation/QProcessedObjectMapping.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| package com.evolveum.midpoint.repo.sqale.qmodel.simulation; | ||
|
|
||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import com.evolveum.midpoint.prism.PrismConstants; | ||
| import com.evolveum.midpoint.prism.path.ItemName; | ||
| import com.evolveum.midpoint.prism.path.PathSet; | ||
| import com.evolveum.midpoint.repo.sqale.SqaleRepoContext; | ||
| import com.evolveum.midpoint.repo.sqale.SqaleUtils; | ||
| import com.evolveum.midpoint.repo.sqale.qmodel.common.QContainerMapping; | ||
| import com.evolveum.midpoint.repo.sqlbase.JdbcSession; | ||
| import com.evolveum.midpoint.repo.sqlbase.mapping.TableRelationResolver; | ||
| import com.evolveum.midpoint.schema.GetOperationOptions; | ||
| import com.evolveum.midpoint.schema.SelectorOptions; | ||
| import com.evolveum.midpoint.util.exception.SchemaException; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.SimulationResultProcessedObjectType; | ||
| import com.querydsl.core.types.Path; | ||
|
|
||
| import static com.evolveum.midpoint.xml.ns._public.common.common_3.SimulationResultProcessedObjectType.*; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.Objects; | ||
|
|
||
|
|
||
| public class QProcessedObjectMapping extends QContainerMapping<SimulationResultProcessedObjectType, QProcessedObject, MProcessedObject, MSimulationResult> { | ||
|
|
||
| public static final String DEFAULT_ALIAS_NAME = "po"; | ||
|
|
||
| // FIXME: This constants should be provided by generated schema code | ||
| public static final ItemName F_BEFORE = new ItemName(F_OID.getNamespaceURI(), "before"); | ||
| public static final ItemName F_AFTER = new ItemName(F_OID.getNamespaceURI(), "after"); | ||
|
|
||
|
|
||
| private static QProcessedObjectMapping instance; | ||
|
|
||
| public static @NotNull QProcessedObjectMapping initProcessedResultMapping(@NotNull SqaleRepoContext repositoryContext) { | ||
| if (needsInitialization(instance, repositoryContext)) { | ||
| instance = new QProcessedObjectMapping(repositoryContext); | ||
| } | ||
| return instance; | ||
| } | ||
|
|
||
| public static QProcessedObjectMapping getProcessedObjectMapping() { | ||
| return Objects.requireNonNull(instance); | ||
| } | ||
|
|
||
| public QProcessedObjectMapping(@NotNull SqaleRepoContext repositoryContext) { | ||
| super(QProcessedObject.TABLE_NAME, DEFAULT_ALIAS_NAME,SimulationResultProcessedObjectType.class, QProcessedObject.class, repositoryContext); | ||
|
|
||
| addRelationResolver(PrismConstants.T_PARENT, | ||
| // mapping supplier is used to avoid cycles in the initialization code | ||
| TableRelationResolver.usingJoin( | ||
| QSimulationResultMapping::getSimulationResultMapping, | ||
| (q, p) -> q.ownerOid.eq(p.oid))); | ||
| // This could be done also by auditRefMapping, but we currently do not support filters which allows searching for target name | ||
| // without dereferencing, which may be unusable for new simulated objects | ||
|
|
||
| addItemMapping(F_OID, uuidMapper(q -> q.oid)); | ||
| addItemMapping(F_NAME, polyStringMapper( | ||
| q -> q.nameOrig, q -> q.nameNorm)); | ||
| // addItemMapping(F_OBJECT_TYPE, )); | ||
|
|
||
| addItemMapping(F_STATE, enumMapper(q -> q.state)); | ||
| addItemMapping(F_METRIC_IDENTIFIER, multiStringMapper(q -> q.metricIdentifiers)); | ||
| } | ||
|
|
||
| /* | ||
| @Override | ||
| public @NotNull Path<?>[] selectExpressions(QProcessedObject row, | ||
| Collection<SelectorOptions<GetOperationOptions>> options) { | ||
| return new Path<?>[] {row.ownerOid, row.cid, row.fullObject}; | ||
| } | ||
| */ | ||
|
|
||
| @Override | ||
| public SimulationResultProcessedObjectType toSchemaObject(MProcessedObject row) throws SchemaException { | ||
| return parseSchemaObject(row.fullObject, row.ownerOid + "," + row.cid); | ||
| } | ||
|
|
||
| @Override | ||
| public MProcessedObject newRowObject() { | ||
| return new MProcessedObject(); | ||
| } | ||
|
|
||
| @Override | ||
| protected QProcessedObject newAliasInstance(String alias) { | ||
| return new QProcessedObject(alias); | ||
| } | ||
|
|
||
| @Override | ||
| public MProcessedObject newRowObject(MSimulationResult ownerRow) { | ||
| MProcessedObject row = newRowObject(); | ||
| row.ownerOid = ownerRow.oid; | ||
| return row; | ||
| } | ||
|
|
||
| @Override | ||
| protected PathSet fullObjectItemsToSkip() { | ||
| // Do not store full objects | ||
| return PathSet.of(F_BEFORE, F_AFTER); | ||
| } | ||
|
|
||
| @Override | ||
| public MProcessedObject insert(SimulationResultProcessedObjectType object, MSimulationResult ownerRow, | ||
| JdbcSession jdbcSession) throws SchemaException { | ||
| MProcessedObject row = initRowObject(object, ownerRow); | ||
| //row.oid | ||
| row.oid = SqaleUtils.oidToUUid(object.getOid()); | ||
| row.nameOrig = object.getName().getOrig(); | ||
| row.nameNorm = object.getName().getNorm(); | ||
| row.state = object.getState(); | ||
|
|
||
| row.metricIdentifiers = stringsToArray(object.getMetricIdentifier()); | ||
| row.fullObject = createFullObject(object); | ||
|
|
||
| // Before / After not serialized | ||
| insert(row, jdbcSession); | ||
| return row; | ||
| } | ||
|
|
||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.