Skip to content

implementation DISCOVER_CSDL_METADATA #45

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
Open

implementation DISCOVER_CSDL_METADATA #45

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
10 changes: 9 additions & 1 deletion ...src/main/java/org/eclipse/daanse/olap/xmla/bridge/discover/DelegatingDiscoverService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.eclipse.daanse.olap.xmla.bridge.ContextGroupXmlaServiceConfig;
import org.eclipse.daanse.olap.xmla.bridge.ContextListSupplyer;
import org.eclipse.daanse.xmla.api.RequestMetaData;
import org.eclipse.daanse.xmla.api.UserRolePrincipal;
import org.eclipse.daanse.xmla.api.discover.DiscoverService;
import org.eclipse.daanse.xmla.api.discover.dbschema.catalogs.DbSchemaCatalogsRequest;
import org.eclipse.daanse.xmla.api.discover.dbschema.catalogs.DbSchemaCatalogsResponseRow;
Expand All @@ -35,6 +34,8 @@
import org.eclipse.daanse.xmla.api.discover.dbschema.tables.DbSchemaTablesResponseRow;
import org.eclipse.daanse.xmla.api.discover.dbschema.tablesinfo.DbSchemaTablesInfoRequest;
import org.eclipse.daanse.xmla.api.discover.dbschema.tablesinfo.DbSchemaTablesInfoResponseRow;
import org.eclipse.daanse.xmla.api.discover.discover.csdlmetadata.DiscoverCsdlMetaDataRequest;
import org.eclipse.daanse.xmla.api.discover.discover.csdlmetadata.DiscoverCsdlMetaDataResponseRow;
import org.eclipse.daanse.xmla.api.discover.discover.datasources.DiscoverDataSourcesRequest;
import org.eclipse.daanse.xmla.api.discover.discover.datasources.DiscoverDataSourcesResponseRow;
import org.eclipse.daanse.xmla.api.discover.discover.enumerators.DiscoverEnumeratorsRequest;
Expand Down Expand Up @@ -268,4 +269,11 @@ public List<DiscoverXmlMetaDataResponseRow> xmlMetaData(DiscoverXmlMetaDataReque
return otherSchemaService.xmlMetaData(request, metaData);
}

@Override
public List<DiscoverCsdlMetaDataResponseRow> csdlMetaData(DiscoverCsdlMetaDataRequest request,
RequestMetaData metaData) {

return otherSchemaService.csdlMetaData(request, metaData);
}

}
44 changes: 43 additions & 1 deletion ...idge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/discover/OtherDiscoverService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import org.eclipse.daanse.xmla.api.discover.dbschema.tables.DbSchemaTablesRequest;
import org.eclipse.daanse.xmla.api.discover.dbschema.tablesinfo.DbSchemaTablesInfoRequest;
import org.eclipse.daanse.xmla.api.discover.discover.csdlmetadata.DiscoverCsdlMetaDataRequest;
import org.eclipse.daanse.xmla.api.discover.discover.csdlmetadata.DiscoverCsdlMetaDataResponseRow;
import org.eclipse.daanse.xmla.api.discover.discover.datasources.DiscoverDataSourcesRequest;
import org.eclipse.daanse.xmla.api.discover.discover.datasources.DiscoverDataSourcesResponseRow;
import org.eclipse.daanse.xmla.api.discover.discover.enumerators.DiscoverEnumeratorsRequest;
Expand Down Expand Up @@ -77,6 +78,7 @@
import org.eclipse.daanse.xmla.api.discover.mdschema.properties.MdSchemaPropertiesRequest;
import org.eclipse.daanse.xmla.api.discover.mdschema.sets.MdSchemaSetsRequest;
import org.eclipse.daanse.xmla.api.xmla.Restriction;
import org.eclipse.daanse.xmla.model.record.discover.discover.csdlmetadata.DiscoverCsdlMetaDataResponseRowR;
import org.eclipse.daanse.xmla.model.record.discover.discover.datasources.DiscoverDataSourcesResponseRowR;
import org.eclipse.daanse.xmla.model.record.discover.discover.enumerators.DiscoverEnumeratorsResponseRowR;
import org.eclipse.daanse.xmla.model.record.discover.discover.keywords.DiscoverKeywordsResponseRowR;
Expand Down Expand Up @@ -111,6 +113,18 @@ public class OtherDiscoverService {
<EditionID>1804890536</EditionID>
</Server>
""";
private static final String csdlMd = """
<Schema
xmlns="http://schemas.microsoft.com/ado/2008/09/edm"
xmlns:edm_annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation"
xmlns:bi="http://schemas.microsoft.com/sqlbi/2010/10/edm/extensions" bi:Version="2.0" Namespace="Sandbox">
<EntityContainer Name="Sandbox">
<Documentation>
<Summary>%s</Summary>
</Documentation>
</EntityContainer>
</Schema>
""";

private static List<Class<?>> classes = List.of(
// DbSchema
Expand Down Expand Up @@ -291,7 +305,7 @@ public List<DiscoverSchemaRowsetsResponseRow> discoverSchemaRowsets(DiscoverSche
}
}
result.add(new DiscoverSchemaRowsetsResponseRowR(o.name(), Optional.ofNullable(o.guid()),
Optional.ofNullable(restrictions), Optional.of((desc == null) ? "" : desc), Optional.empty()));
Optional.ofNullable(restrictions), Optional.ofNullable(desc), Optional.of(7l)));
}
}
return result;
Expand Down Expand Up @@ -331,6 +345,34 @@ public List<DiscoverXmlMetaDataResponseRow> xmlMetaData(DiscoverXmlMetaDataReque
return result;
}

public List<DiscoverCsdlMetaDataResponseRow> csdlMetaData(DiscoverCsdlMetaDataRequest request,
RequestMetaData metaData) {
List<DiscoverCsdlMetaDataResponseRow> result = new ArrayList<>();
Optional<String> catalogName = request.restrictions().catalogName();
if (!catalogName.isPresent()) {
catalogName = request.properties().catalog();
}
if (catalogName.isPresent()) {
Optional<Catalog> oCatalog = contextsListSupplyer.tryGetFirstByName(catalogName.get(), metaData.sessionId());
if (oCatalog.isPresent()) {
Catalog catalog = oCatalog.get();

if (catalog != null) {
//TODO implement CsdlMetaDataResponse
result.add(new DiscoverCsdlMetaDataResponseRowR(String.format(csdlMd, catalog.getName())));
}
}
} else {
List<Catalog> cs = contextsListSupplyer.get(metaData.sessionId());
if (cs != null) {
Catalog catalog = cs.get(0);
//TODO implement CsdlMetaDataResponse
result.add(new DiscoverCsdlMetaDataResponseRowR(String.format(csdlMd, catalog.getName())));
}
}
return result;
}

private String getOperationDescription(String name) {
switch (name) {
case "DBSCHEMA_CATALOGS":
Expand Down
Loading