Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[CARBONDATA-3217] Optimize implicit filter expression performance by …
…removing extra serialization Fixed performance issue for Implicit filter column 1. Removed serialization all the implicit filter values in each task. Instead serialized values only for the blocks going to particular task 2. Removed 2 times deserialization of implicit filter values in executor for each task. 1 time is sufficient This closes #3039
- Loading branch information
1 parent
9fa045d
commit bc1e944
Showing
12 changed files
with
443 additions
and
69 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
109 changes: 109 additions & 0 deletions
109
.../main/java/org/apache/carbondata/core/scan/expression/conditional/ImplicitExpression.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,109 @@ | ||
| /* | ||
| * 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.carbondata.core.scan.expression.conditional; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.HashSet; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| import org.apache.carbondata.core.constants.CarbonCommonConstants; | ||
| import org.apache.carbondata.core.scan.expression.Expression; | ||
| import org.apache.carbondata.core.scan.expression.ExpressionResult; | ||
| import org.apache.carbondata.core.scan.expression.LiteralExpression; | ||
| import org.apache.carbondata.core.scan.expression.exception.FilterIllegalMemberException; | ||
| import org.apache.carbondata.core.scan.expression.exception.FilterUnsupportedException; | ||
| import org.apache.carbondata.core.scan.filter.intf.ExpressionType; | ||
| import org.apache.carbondata.core.scan.filter.intf.RowIntf; | ||
|
|
||
| import org.apache.commons.lang.StringUtils; | ||
|
|
||
| /** | ||
| * Custom class to handle filter values for Implicit filter | ||
| */ | ||
| public class ImplicitExpression extends Expression { | ||
|
|
||
| /** | ||
| * map that contains the mapping of block id to the valid blocklets in that block which contain | ||
| * the data as per the applied filter | ||
| */ | ||
| private Map<String, Set<Integer>> blockIdToBlockletIdMapping; | ||
|
|
||
| public ImplicitExpression(List<Expression> implicitFilterList) { | ||
| // initialize map with half the size of filter list as one block id can contain | ||
| // multiple blocklets | ||
| blockIdToBlockletIdMapping = new HashMap<>(implicitFilterList.size() / 2); | ||
| for (Expression value : implicitFilterList) { | ||
| String blockletPath = ((LiteralExpression) value).getLiteralExpValue().toString(); | ||
| addBlockEntry(blockletPath); | ||
| } | ||
| } | ||
|
|
||
| public ImplicitExpression(Map<String, Set<Integer>> blockIdToBlockletIdMapping) { | ||
| this.blockIdToBlockletIdMapping = blockIdToBlockletIdMapping; | ||
| } | ||
|
|
||
| private void addBlockEntry(String blockletPath) { | ||
| String blockId = | ||
| blockletPath.substring(0, blockletPath.lastIndexOf(CarbonCommonConstants.FILE_SEPARATOR)); | ||
| Set<Integer> blockletIds = blockIdToBlockletIdMapping.get(blockId); | ||
| if (null == blockletIds) { | ||
| blockletIds = new HashSet<>(); | ||
| blockIdToBlockletIdMapping.put(blockId, blockletIds); | ||
| } | ||
| blockletIds.add(Integer.parseInt(blockletPath.substring(blockId.length() + 1))); | ||
| } | ||
|
|
||
| @Override public ExpressionResult evaluate(RowIntf value) | ||
| throws FilterUnsupportedException, FilterIllegalMemberException { | ||
| throw new UnsupportedOperationException("Operation not supported for Implicit expression"); | ||
| } | ||
|
|
||
| public Map<String, Set<Integer>> getBlockIdToBlockletIdMapping() { | ||
| return blockIdToBlockletIdMapping; | ||
| } | ||
|
|
||
| @Override public ExpressionType getFilterExpressionType() { | ||
| return ExpressionType.IMPLICIT; | ||
| } | ||
|
|
||
| @Override public void findAndSetChild(Expression oldExpr, Expression newExpr) { | ||
| } | ||
|
|
||
| @Override public String getString() { | ||
| StringBuilder value = new StringBuilder(); | ||
| value.append("ImplicitExpression("); | ||
| for (Map.Entry<String, Set<Integer>> entry : blockIdToBlockletIdMapping.entrySet()) { | ||
| value.append(entry.getKey()).append(" --> "); | ||
| value.append( | ||
| StringUtils.join(entry.getValue().toArray(new Integer[entry.getValue().size()]), ",")) | ||
| .append(";"); | ||
| // return maximum of 100 characters in the getString method | ||
| if (value.length() > 100) { | ||
| value.append("..."); | ||
| break; | ||
| } | ||
| } | ||
| value.append(')'); | ||
| return value.toString(); | ||
| } | ||
|
|
||
| @Override public String getStatement() { | ||
| return getString(); | ||
| } | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,5 +43,6 @@ public enum ExpressionType { | |
| STARTSWITH, | ||
| ENDSWITH, | ||
| CONTAINSWITH, | ||
| TEXT_MATCH | ||
| TEXT_MATCH, | ||
| IMPLICIT | ||
| } | ||
Oops, something went wrong.