Github user ravipesala commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/1079#discussion_r125154262
--- Diff:
core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelRangeLessThanFiterExecuterImpl.java
---
@@ -77,72 +89,188 @@ private void ifDefaultValueMatchesFilter() {
}
}
}
+ } else if (!msrColEvalutorInfoList.isEmpty() &&
!isMeasurePresentInCurrentBlock[0]) {
+ CarbonMeasure measure =
this.msrColEvalutorInfoList.get(0).getMeasure();
+ byte[] defaultValue = measure.getDefaultValue();
+ if (null != defaultValue) {
+ for (int k = 0; k < filterRangeValues.length; k++) {
+ int maxCompare =
+
ByteUtil.UnsafeComparer.INSTANCE.compareTo(filterRangeValues[k], defaultValue);
+ if (maxCompare > 0) {
+ isDefaultValuePresentInFilter = true;
+ break;
+ }
+ }
+ }
}
}
@Override public BitSet isScanRequired(byte[][] blockMaxValue, byte[][]
blockMinValue) {
BitSet bitSet = new BitSet(1);
- boolean isScanRequired =
- isScanRequired(blockMinValue[dimensionBlocksIndex[0]],
filterRangeValues);
+ byte[] minValue = null;
+ boolean isScanRequired = false;
+ if (isMeasurePresentInCurrentBlock[0] ||
isDimensionPresentInCurrentBlock[0]) {
+ if (isMeasurePresentInCurrentBlock[0]) {
+ minValue = blockMinValue[measureBlocksIndex[0] +
lastDimensionColOrdinal];
+ isScanRequired =
+ isScanRequired(minValue, filterRangeValues,
msrColEvalutorInfoList.get(0).getType());
+ } else {
+ minValue = blockMinValue[dimensionBlocksIndex[0]];
+ isScanRequired = isScanRequired(minValue, filterRangeValues);
+ }
+ } else {
+ isScanRequired = isDefaultValuePresentInFilter;
+ }
if (isScanRequired) {
bitSet.set(0);
}
return bitSet;
}
+
private boolean isScanRequired(byte[] blockMinValue, byte[][]
filterValues) {
boolean isScanRequired = false;
- if (isDimensionPresentInCurrentBlock[0]) {
- for (int k = 0; k < filterValues.length; k++) {
- // and filter-min should be positive
- int minCompare =
ByteUtil.UnsafeComparer.INSTANCE.compareTo(filterValues[k], blockMinValue);
+ for (int k = 0; k < filterValues.length; k++) {
+ // and filter-min should be positive
+ int minCompare =
ByteUtil.UnsafeComparer.INSTANCE.compareTo(filterValues[k], blockMinValue);
- // if any filter applied is not in range of min and max of block
- // then since its a less than fiter validate whether the block
- // min range is less than applied filter member
- if (minCompare > 0) {
- isScanRequired = true;
- break;
- }
+ // if any filter applied is not in range of min and max of block
+ // then since its a less than equal to fiter validate whether the
block
+ // min range is less than equal to applied filter member
+ if (minCompare > 0) {
+ isScanRequired = true;
+ break;
}
- } else {
- isScanRequired = isDefaultValuePresentInFilter;
}
return isScanRequired;
}
+ private boolean isScanRequired(byte[] minValue, byte[][] filterValue,
+ DataType dataType) {
+ for (int i = 0; i < filterValue.length; i++) {
+ if (filterValue[i].length == 0 || minValue.length == 0) {
+ return isScanRequired(minValue, filterValue);
+ }
+ switch (dataType) {
--- End diff --
Use existing methods of `DataTypeUtil` and comparator here
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
