-
Notifications
You must be signed in to change notification settings - Fork 1.1k
[IOTDB-17798] Implement table model NEXT fill #17810
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
Open
DaZuiZui
wants to merge
4
commits into
apache:master
Choose a base branch
from
DaZuiZui:fix/next-fill
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
101 changes: 101 additions & 0 deletions
101
iotdb-core/calc-commons/src/main/codegen/templates/nextFill.ftl
This file contains hidden or 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,101 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
| <@pp.dropOutputFile /> | ||
|
|
||
| <#list allDataTypes.types as type> | ||
|
|
||
| <#assign className = "${type.dataType?cap_first}NextFill"> | ||
| <@pp.changeOutputFile name="/org/apache/iotdb/calc/execution/operator/process/fill/next/${className}.java" /> | ||
| package org.apache.iotdb.calc.execution.operator.process.fill.next; | ||
|
|
||
| import org.apache.iotdb.calc.execution.operator.process.fill.IFillFilter; | ||
| import org.apache.tsfile.block.column.Column; | ||
| import org.apache.tsfile.read.common.block.column.${type.column}; | ||
| import org.apache.tsfile.read.common.block.column.${type.column}Builder; | ||
| import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn; | ||
| <#if type.dataType == "Binary"> | ||
| import org.apache.tsfile.utils.Binary; | ||
| </#if> | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| /* | ||
| * This class is generated using freemarker and the ${.template_name} template. | ||
| */ | ||
| @SuppressWarnings("unused") | ||
| public class ${className} extends NextFill { | ||
|
|
||
| private ${type.dataType} nextValue; | ||
| private ${type.dataType} nextValueInCurrentColumn; | ||
|
|
||
| public ${className}(IFillFilter filter) { | ||
| super(filter); | ||
| } | ||
|
|
||
| @Override | ||
| void fillValue(Column column, int index, Object array) { | ||
| ((${type.dataType}[]) array)[index] = column.get${type.dataType?cap_first}(index); | ||
| } | ||
|
|
||
| @Override | ||
| void fillNextValueInCurrentColumn(Object array, int index) { | ||
| ((${type.dataType}[]) array)[index] = nextValueInCurrentColumn; | ||
| } | ||
|
|
||
| @Override | ||
| Object createValueArray(int size) { | ||
| return new ${type.dataType}[size]; | ||
| } | ||
|
|
||
| @Override | ||
| Column createNullValueColumn() { | ||
| return ${type.column}Builder.NULL_VALUE_BLOCK; | ||
| } | ||
|
|
||
| @Override | ||
| Column createRunLengthEncodedFilledValueColumn(int size) { | ||
| return new RunLengthEncodedColumn( | ||
| new ${type.column}(1, Optional.empty(), new ${type.dataType}[] {nextValueInCurrentColumn}), size); | ||
| } | ||
|
|
||
| @Override | ||
| Column createFilledValueColumn(Object array, boolean[] isNull, boolean hasNullValue, int size) { | ||
| if (hasNullValue) { | ||
| return new ${type.column}(size, Optional.of(isNull), (${type.dataType}[]) array); | ||
| } else { | ||
| return new ${type.column}(size, Optional.empty(), (${type.dataType}[]) array); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| void updateNextValue(Column nextValueColumn, int index) { | ||
| this.nextValue = nextValueColumn.get${type.dataType?cap_first}(index); | ||
| } | ||
|
|
||
| @Override | ||
| void updateNextValueInCurrentColumn(Column nextValueColumn, int index) { | ||
| this.nextValueInCurrentColumn = nextValueColumn.get${type.dataType?cap_first}(index); | ||
| } | ||
|
|
||
| @Override | ||
| void updateNextValueInCurrentColumn() { | ||
| this.nextValueInCurrentColumn = this.nextValue; | ||
| } | ||
| } | ||
| </#list> |
81 changes: 81 additions & 0 deletions
81
...src/main/java/org/apache/iotdb/calc/execution/operator/process/TableNextFillOperator.java
This file contains hidden or 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,81 @@ | ||
| /* | ||
| * 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.iotdb.calc.execution.operator.process; | ||
|
|
||
| import org.apache.iotdb.calc.execution.operator.CommonOperatorContext; | ||
| import org.apache.iotdb.calc.execution.operator.Operator; | ||
| import org.apache.iotdb.calc.execution.operator.process.fill.ILinearFill; | ||
|
|
||
| import org.apache.tsfile.block.column.Column; | ||
| import org.apache.tsfile.read.common.block.TsBlock; | ||
|
|
||
| import static com.google.common.base.Preconditions.checkArgument; | ||
|
|
||
| public class TableNextFillOperator extends AbstractLinearFillOperator { | ||
|
|
||
| // start from 0; -1 means plain NEXT has no helper column. | ||
| private final int helperColumnIndex; | ||
|
|
||
| private final boolean hasTimeBound; | ||
|
|
||
| public TableNextFillOperator( | ||
| CommonOperatorContext operatorContext, | ||
| ILinearFill[] fillArray, | ||
| Operator child, | ||
| int helperColumnIndex, | ||
| boolean hasTimeBound) { | ||
| super(operatorContext, fillArray, child); | ||
| checkArgument( | ||
| !hasTimeBound || helperColumnIndex != -1, | ||
| "helperColumnIndex should be resolved when timeBound exists"); | ||
| this.helperColumnIndex = helperColumnIndex; | ||
| this.hasTimeBound = hasTimeBound; | ||
| } | ||
|
|
||
| @Override | ||
| protected Column getHelperColumn(TsBlock tsBlock) { | ||
| return helperColumnIndex == -1 ? tsBlock.getTimeColumn() : tsBlock.getColumn(helperColumnIndex); | ||
| } | ||
|
|
||
| @Override | ||
| protected Integer getLastRowIndexForNonNullHelperColumn(TsBlock tsBlock) { | ||
| int size = tsBlock.getPositionCount(); | ||
| if (!hasTimeBound) { | ||
| return size - 1; | ||
| } | ||
| Column helperColumn = getHelperColumn(tsBlock); | ||
| if (!helperColumn.mayHaveNull()) { | ||
| return size - 1; | ||
| } else { | ||
| int i = size - 1; | ||
| for (; i >= 0; i--) { | ||
| if (!helperColumn.isNull(i)) { | ||
| break; | ||
| } | ||
| } | ||
| return i; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public long ramBytesUsed() { | ||
| return super.ramBytesUsed() + Integer.BYTES; | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.