forked from apache/drill
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
DRILL-4120: Allow implicit columns for Avro storage format
closes apache#1138
- Loading branch information
1 parent
dfe47ce
commit 4652b0b
Showing
19 changed files
with
471 additions
and
77 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
42 changes: 42 additions & 0 deletions
42
.../java-exec/src/main/java/org/apache/drill/exec/planner/logical/ExtendableRelDataType.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,42 @@ | ||
| /* | ||
| * 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.planner.logical; | ||
|
|
||
| import org.apache.calcite.rel.type.RelDataTypeFactory; | ||
| import org.apache.drill.exec.planner.types.ExtendableRelDataTypeHolder; | ||
| import org.apache.drill.exec.planner.types.RelDataTypeDrillImpl; | ||
|
|
||
| /** | ||
| * RelDataType for non-dynamic table structure which | ||
| * may be extended by adding partitions or implicit columns. | ||
| */ | ||
| public class ExtendableRelDataType extends RelDataTypeDrillImpl { | ||
|
|
||
| public ExtendableRelDataType(ExtendableRelDataTypeHolder holder, RelDataTypeFactory typeFactory) { | ||
| super(holder, typeFactory); | ||
| } | ||
|
|
||
| @Override | ||
| protected void generateTypeString(StringBuilder sb, boolean withDetail) { | ||
| sb.append("(ExtendableRelDataType").append(getFieldNames()).append(")"); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isDynamicStruct() { | ||
| return false; | ||
| } | ||
| } |
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
71 changes: 71 additions & 0 deletions
71
...ava-exec/src/main/java/org/apache/drill/exec/planner/types/AbstractRelDataTypeHolder.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,71 @@ | ||
| /* | ||
| * 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.planner.types; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.common.collect.Lists; | ||
| import org.apache.calcite.rel.type.RelDataTypeFactory; | ||
| import org.apache.calcite.rel.type.RelDataTypeField; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Base class-holder for the list of {@link RelDataTypeField}s. | ||
| */ | ||
| public abstract class AbstractRelDataTypeHolder { | ||
| protected final List<RelDataTypeField> fields; | ||
| protected RelDataTypeFactory typeFactory; | ||
|
|
||
| public AbstractRelDataTypeHolder(List<RelDataTypeField> fields) { | ||
| this.fields = Lists.newArrayList(fields); | ||
| } | ||
|
|
||
| /** | ||
| * Returns RelDataTypeField field with specified name. | ||
| */ | ||
| public abstract RelDataTypeField getField(RelDataTypeFactory typeFactory, String fieldName); | ||
|
|
||
| /** | ||
| * Returns list with all RelDataTypeField fields in this holder. | ||
| */ | ||
| public List<RelDataTypeField> getFieldList(RelDataTypeFactory typeFactory) { | ||
| return ImmutableList.copyOf(fields); | ||
| } | ||
|
|
||
| /** | ||
| * Returns count of RelDataTypeField fields in this holder. | ||
| */ | ||
| public int getFieldCount() { | ||
| return fields.size(); | ||
| } | ||
|
|
||
| /** | ||
| * Returns list with names of RelDataTypeField fields. | ||
| */ | ||
| public List<String> getFieldNames() { | ||
| List<String> fieldNames = Lists.newArrayList(); | ||
| for(RelDataTypeField f : fields) { | ||
| fieldNames.add(f.getName()); | ||
| } | ||
|
|
||
| return fieldNames; | ||
| } | ||
|
|
||
| public void setRelDataTypeFactory(RelDataTypeFactory typeFactory) { | ||
| this.typeFactory = typeFactory; | ||
| } | ||
| } |
82 changes: 82 additions & 0 deletions
82
...a-exec/src/main/java/org/apache/drill/exec/planner/types/ExtendableRelDataTypeHolder.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,82 @@ | ||
| /* | ||
| * 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.planner.types; | ||
|
|
||
| import org.apache.calcite.rel.type.RelDataTypeFactory; | ||
| import org.apache.calcite.rel.type.RelDataTypeField; | ||
| import org.apache.calcite.rel.type.RelDataTypeFieldImpl; | ||
| import org.apache.calcite.sql.type.SqlTypeName; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Holder for list of RelDataTypeField which may be expanded by implicit columns. | ||
| */ | ||
| public class ExtendableRelDataTypeHolder extends AbstractRelDataTypeHolder { | ||
| private final List<String> implicitColumnNames; | ||
|
|
||
| public ExtendableRelDataTypeHolder(List<RelDataTypeField> fields, List<String> implicitColumnNames) { | ||
| super(fields); | ||
| this.implicitColumnNames = implicitColumnNames; | ||
| } | ||
|
|
||
| /** | ||
| * Returns RelDataTypeField field with specified name. | ||
| * If field is implicit and absent in the fields list, it will be added. | ||
| * | ||
| * @param typeFactory RelDataTypeFactory which will be used | ||
| * for the creation of RelDataType for new fields. | ||
| * @param fieldName name of the field. | ||
| * @return RelDataTypeField field | ||
| */ | ||
| public RelDataTypeField getField(RelDataTypeFactory typeFactory, String fieldName) { | ||
|
|
||
| /* First check if this field name exists in our field list */ | ||
| for (RelDataTypeField f : fields) { | ||
| if (fieldName.equalsIgnoreCase(f.getName())) { | ||
| return f; | ||
| } | ||
| } | ||
| RelDataTypeField newField = null; | ||
|
|
||
| if (isImplicitField(fieldName)) { | ||
| // This implicit field does not exist in our field list, add it | ||
| newField = new RelDataTypeFieldImpl( | ||
| fieldName, | ||
| fields.size(), | ||
| typeFactory.createTypeWithNullability( | ||
| typeFactory.createSqlType(SqlTypeName.VARCHAR), true)); | ||
| fields.add(newField); | ||
| } | ||
| return newField; | ||
| } | ||
|
|
||
| /** | ||
| * Checks that specified field is implicit. | ||
| * | ||
| * @param fieldName name of the field which should be checked | ||
| * @return {@code true} if specified filed is implicit | ||
| */ | ||
| private boolean isImplicitField(String fieldName) { | ||
| for (String implicitColumn : implicitColumnNames) { | ||
| if (implicitColumn.equalsIgnoreCase(fieldName)) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
| } |
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
Oops, something went wrong.