Skip to content

Commit 987ea12

Browse files
committed
Do not wrap HBase filter exception with IOException
1 parent d912d20 commit 987ea12

1 file changed

Lines changed: 25 additions & 29 deletions

File tree

extensions/datastores/hbase/src/main/java/org/locationtech/geowave/datastore/hbase/filters/HBaseDistributableFilter.java

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -314,38 +314,34 @@ protected boolean filterInternal(final CommonIndexedPersistenceEncoding encoding
314314
protected FlattenedUnreadData aggregateFieldData(
315315
final Cell cell,
316316
final PersistentDataset<CommonIndexValue> commonData) throws IOException {
317-
try {
318-
final byte[] qualBuf = CellUtil.cloneQualifier(cell);
319-
final byte[] valBuf = CellUtil.cloneValue(cell);
320-
321-
final FlattenedDataSet dataSet =
322-
DataStoreUtils.decomposeFlattenedFields(
323-
qualBuf,
324-
valBuf,
325-
null,
326-
commonIndexFieldIds.size() - 1);
327-
328-
final List<FlattenedFieldInfo> fieldInfos = dataSet.getFieldsRead();
329-
for (final FlattenedFieldInfo fieldInfo : fieldInfos) {
330-
final int ordinal = fieldInfo.getFieldPosition();
331-
332-
if (ordinal < commonIndexFieldIds.size()) {
333-
final String commonIndexFieldName = commonIndexFieldIds.get(ordinal);
334-
final FieldReader<? extends CommonIndexValue> reader =
335-
model.getReader(commonIndexFieldName);
336-
if (reader != null) {
337-
final CommonIndexValue fieldValue = reader.readField(fieldInfo.getValue());
338-
commonData.addValue(commonIndexFieldName, fieldValue);
339-
} else {
340-
LOGGER.error("Could not find reader for common index field: " + commonIndexFieldName);
341-
}
317+
final byte[] qualBuf = CellUtil.cloneQualifier(cell);
318+
final byte[] valBuf = CellUtil.cloneValue(cell);
319+
320+
final FlattenedDataSet dataSet =
321+
DataStoreUtils.decomposeFlattenedFields(
322+
qualBuf,
323+
valBuf,
324+
null,
325+
commonIndexFieldIds.size() - 1);
326+
327+
final List<FlattenedFieldInfo> fieldInfos = dataSet.getFieldsRead();
328+
for (final FlattenedFieldInfo fieldInfo : fieldInfos) {
329+
final int ordinal = fieldInfo.getFieldPosition();
330+
331+
if (ordinal < commonIndexFieldIds.size()) {
332+
final String commonIndexFieldName = commonIndexFieldIds.get(ordinal);
333+
final FieldReader<? extends CommonIndexValue> reader =
334+
model.getReader(commonIndexFieldName);
335+
if (reader != null) {
336+
final CommonIndexValue fieldValue = reader.readField(fieldInfo.getValue());
337+
commonData.addValue(commonIndexFieldName, fieldValue);
338+
} else {
339+
LOGGER.error("Could not find reader for common index field: " + commonIndexFieldName);
342340
}
343341
}
344-
345-
return dataSet.getFieldsDeferred();
346-
} catch (final Exception e) {
347-
throw new IOException("Exception while aggregating field data", e);
348342
}
343+
344+
return dataSet.getFieldsDeferred();
349345
}
350346

351347
public int getPartitionKeyLength() {

0 commit comments

Comments
 (0)