Skip to content
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.

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

DRILL-8453: Add XSD Support to XML Reader (Part 1) #2824

Merged
merged 19 commits into from
Aug 29, 2023
Merged
16 changes: 13 additions & 3 deletions contrib/format-xml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
limitations under the License.

-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -36,7 +37,16 @@
<artifactId>drill-java-exec</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema-core</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema-walker</artifactId>
<version>2.3.0</version>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.drill.exec</groupId>
Expand Down Expand Up @@ -81,4 +91,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

public class XMLReader implements Closeable {
private static final Logger logger = LoggerFactory.getLogger(XMLReader.class);
private static final String ATTRIBUTE_MAP_NAME = "attributes";
public static final String ATTRIBUTE_MAP_NAME = "attributes";

private final Stack<String> fieldNameStack;
private final Stack<TupleWriter> rowWriterStack;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.drill.exec.store.xml.xsd;

import org.apache.drill.common.types.TypeProtos.MinorType;
import org.apache.drill.exec.record.metadata.SchemaBuilder;
import org.apache.drill.exec.record.metadata.TupleMetadata;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableMap;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaElement;

import org.apache.ws.commons.schema.XmlSchemaObject;
import org.apache.ws.commons.schema.walker.XmlSchemaWalker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.xml.transform.stream.StreamSource;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Paths;

public class DrillXSDSchemaUtils {
private static final MinorType DEFAULT_TYPE = MinorType.VARCHAR;
private static final Logger logger = LoggerFactory.getLogger(DrillXSDSchemaUtils.class);

/**
* This map maps the data types defined by the XSD definition to Drill data types.
*/
public static final ImmutableMap<String, MinorType> XML_TYPE_MAPPINGS = ImmutableMap.<String, MinorType>builder()
.put("BASE64BINARY", MinorType.VARBINARY)
.put("BOOLEAN", MinorType.BIT)
.put("DATE", MinorType.DATE)
.put("DATETIME", MinorType.TIMESTAMP)
.put("DECIMAL", MinorType.VARDECIMAL)
.put("DOUBLE", MinorType.FLOAT8)
.put("DURATION", MinorType.INTERVAL)
.put("FLOAT", MinorType.FLOAT4)
.put("HEXBINARY", MinorType.VARBINARY)
.put("STRING", MinorType.VARCHAR)
.put("TIME", MinorType.TIME)
.build();

/**
* This function is only used for testing, but accepts a XSD file as input rather than a {@link InputStream}
* @param filename A {@link String} containing an XSD file.
* @return A {@link TupleMetadata} containing a Drill representation of the XSD schema.
* @throws IOException If anything goes wrong or the file is not found.
*/
@VisibleForTesting
public static TupleMetadata getSchema(String filename) throws IOException {
cgivre marked this conversation as resolved.
Show resolved Hide resolved
InputStream inputStream = Files.newInputStream(Paths.get(filename));
return processSchema(inputStream);
}

/**
* Returns a {@link TupleMetadata} of the schema from an XSD file from an InputStream.
* @param inputStream A {@link InputStream} containing an XSD file.
* @return A {@link TupleMetadata} of the schema from the XSD file.
*/
public static TupleMetadata getSchema(InputStream inputStream) {
return processSchema(inputStream);
}

private static TupleMetadata processSchema(InputStream inputStream) {
XmlSchemaCollection schemaCollection = new XmlSchemaCollection();
schemaCollection.read(new StreamSource(inputStream));

DrillXSDSchemaVisitor schemaVisitor = new DrillXSDSchemaVisitor(new SchemaBuilder());
XmlSchema[] schemas = schemaCollection.getXmlSchemas();
XmlSchemaWalker walker = new XmlSchemaWalker(schemaCollection, schemaVisitor);

// Walk all the schemata.
for (XmlSchema schema : schemas) {
for (XmlSchemaObject schemaObject : schema.getItems()) {
if (schemaObject instanceof XmlSchemaElement) {
walker.walk((XmlSchemaElement) schemaObject);
}
}
}
return schemaVisitor.getDrillSchema();
}

/**
* Returns a {@link MinorType} of the corresponding XML Data Type. Defaults to VARCHAR if unknown
* @param xmlType A String of the XML Data Type
* @return A {@link MinorType} of the Drill data type.
*/
public static MinorType getDrillDataType(String xmlType) {
try {
MinorType type = DrillXSDSchemaUtils.XML_TYPE_MAPPINGS.get(xmlType);
if (type == null) {
return DEFAULT_TYPE;
} else {
return type;
}
} catch (NullPointerException e) {
logger.warn("Unknown data type found in XSD reader: {}. Returning VARCHAR.", xmlType);
return DEFAULT_TYPE;
}
}
}
Loading
Loading