luocooong commented on a change in pull request #2171: URL: https://github.com/apache/drill/pull/2171#discussion_r575923281
########## File path: contrib/udfs/src/main/java/org/apache/drill/exec/udfs/ComplexSchemaUtils.java ########## @@ -0,0 +1,68 @@ +/* + * 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.udfs; + +import io.netty.buffer.DrillBuf; +import org.apache.drill.exec.expr.holders.VarCharHolder; +import org.apache.drill.exec.vector.complex.reader.FieldReader; +import org.apache.drill.exec.vector.complex.writer.BaseWriter; + +import java.util.Iterator; + +public class ComplexSchemaUtils { + + public static void getFields(FieldReader reader, BaseWriter.ComplexWriter outWriter, DrillBuf buffer) { + + BaseWriter.MapWriter queryMapWriter = outWriter.rootAsMap(); + + if (!reader.getType().getMinorType().toString().equalsIgnoreCase("MAP")) { + // If the field is not a map, return an empty map + queryMapWriter.start(); + queryMapWriter.end(); + } + + Iterator<String> fieldIterator = reader.iterator(); + queryMapWriter.start(); + int fieldCount = 0; Review comment: The value of the local variable `fieldCount` is not used ########## File path: contrib/udfs/src/main/java/org/apache/drill/exec/udfs/ComplexSchemaUtils.java ########## @@ -0,0 +1,68 @@ +/* + * 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.udfs; + +import io.netty.buffer.DrillBuf; +import org.apache.drill.exec.expr.holders.VarCharHolder; +import org.apache.drill.exec.vector.complex.reader.FieldReader; +import org.apache.drill.exec.vector.complex.writer.BaseWriter; + +import java.util.Iterator; + +public class ComplexSchemaUtils { + + public static void getFields(FieldReader reader, BaseWriter.ComplexWriter outWriter, DrillBuf buffer) { + + BaseWriter.MapWriter queryMapWriter = outWriter.rootAsMap(); + + if (!reader.getType().getMinorType().toString().equalsIgnoreCase("MAP")) { Review comment: Is better to use `==` to equals (Only Enum)? So, maybe there is a simply way : ``` if (!(reader.getType().getMinorType() == MinorType.MAP)) ``` ########## File path: contrib/udfs/src/main/java/org/apache/drill/exec/udfs/ComplexSchemaUtils.java ########## @@ -0,0 +1,68 @@ +/* + * 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.udfs; + +import io.netty.buffer.DrillBuf; +import org.apache.drill.exec.expr.holders.VarCharHolder; +import org.apache.drill.exec.vector.complex.reader.FieldReader; +import org.apache.drill.exec.vector.complex.writer.BaseWriter; + +import java.util.Iterator; + +public class ComplexSchemaUtils { + + public static void getFields(FieldReader reader, BaseWriter.ComplexWriter outWriter, DrillBuf buffer) { + + BaseWriter.MapWriter queryMapWriter = outWriter.rootAsMap(); + + if (!reader.getType().getMinorType().toString().equalsIgnoreCase("MAP")) { + // If the field is not a map, return an empty map + queryMapWriter.start(); + queryMapWriter.end(); + } + + Iterator<String> fieldIterator = reader.iterator(); + queryMapWriter.start(); + int fieldCount = 0; + + while (fieldIterator.hasNext()) { + String fieldName = fieldIterator.next(); + FieldReader fieldReader = reader.reader(fieldName); + String dataType = fieldReader.getType().getMinorType().toString(); + + String dataMode = fieldReader.getType().getMode().toString(); + if (dataMode.equalsIgnoreCase("REPEATED")) { Review comment: There is a simply way : ``` DataMode dataMode = fieldReader.getType().getMode(); if (dataMode == DataMode.REPEATED) { dataType = dataMode + "_" + dataType; } ``` ########## File path: contrib/udfs/src/test/java/org/apache/drill/exec/udfs/TestComplexSchemaFunctions.java ########## @@ -0,0 +1,116 @@ +/* + * 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.udfs; + +import org.apache.drill.categories.SqlFunctionTest; +import org.apache.drill.categories.UnlikelyTest; +import org.apache.drill.common.types.TypeProtos.MinorType; +import org.apache.drill.exec.physical.rowSet.RowSet; +import org.apache.drill.exec.record.metadata.SchemaBuilder; +import org.apache.drill.exec.record.metadata.TupleMetadata; +import org.apache.drill.exec.rpc.RpcException; +import org.apache.drill.test.ClusterFixture; +import org.apache.drill.test.ClusterFixtureBuilder; +import org.apache.drill.test.ClusterTest; +import org.apache.drill.test.QueryBuilder; +import org.apache.drill.test.rowSet.RowSetComparison; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import static org.apache.drill.test.rowSet.RowSetUtilities.mapArray; +import static org.apache.drill.test.rowSet.RowSetUtilities.strArray; +import static org.junit.Assert.assertEquals; + +@Category({UnlikelyTest.class, SqlFunctionTest.class}) +public class TestComplexSchemaFunctions extends ClusterTest { + + @BeforeClass + public static void setup() throws Exception { + ClusterFixtureBuilder builder = ClusterFixture.builder(dirTestWatcher); + startCluster(builder); + } + + @Test + public void testMapSchemaFunction() throws RpcException { + String sql = "SELECT getMapSchema(record) AS schema FROM cp.`json/nestedSchema.json`"; + + QueryBuilder q = client.queryBuilder().sql(sql); + RowSet results = q.rowSet(); + assertEquals(results.rowCount(), 1); + + TupleMetadata expectedSchema = new SchemaBuilder() + .addMap("schema") + .addNullable("int_field", MinorType.VARCHAR) + .addNullable("double_field", MinorType.VARCHAR) + .addNullable("string_field", MinorType.VARCHAR) + .addNullable("int_list", MinorType.VARCHAR) + .addNullable("double_list", MinorType.VARCHAR) + .addNullable("map", MinorType.VARCHAR) + .resumeSchema() + .build(); + + RowSet expected = client.rowSetBuilder(expectedSchema) + .addRow((Object)strArray("BIGINT", "FLOAT8", "VARCHAR", "REPEATED_BIGINT", "REPEATED_FLOAT8", "MAP")) Review comment: Is it possible to add the `REPEATED_MAP`,`BIT` to validation? then, Error If use the following data, could we describe the default behavior in the docs? ``` "repeated_map": [ { "a" : 1 }, { "b" : 2 }, { "a" : "abc" } ] ``` ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
