Skip to content

Commit 533f3cd

Browse files
committed
Fix based on review
1 parent dcc742e commit 533f3cd

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

core/src/main/java/com/scalar/db/storage/objectstorage/ClusteringKeyComparator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.scalar.db.api.Scan;
55
import com.scalar.db.api.TableMetadata;
66
import com.scalar.db.io.Column;
7+
import com.scalar.db.io.DataType;
78
import java.util.Comparator;
89
import java.util.Map;
910

@@ -19,12 +20,11 @@ public int compare(Map<String, Object> clusteringKey1, Map<String, Object> clust
1920
for (String columnName : metadata.getClusteringKeyNames()) {
2021
Scan.Ordering.Order order = metadata.getClusteringOrder(columnName);
2122

23+
DataType dataType = metadata.getColumnDataType(columnName);
2224
Column<?> column1 =
23-
ColumnValueMapper.convert(
24-
clusteringKey1.get(columnName), columnName, metadata.getColumnDataType(columnName));
25+
ColumnValueMapper.convert(clusteringKey1.get(columnName), columnName, dataType);
2526
Column<?> column2 =
26-
ColumnValueMapper.convert(
27-
clusteringKey2.get(columnName), columnName, metadata.getColumnDataType(columnName));
27+
ColumnValueMapper.convert(clusteringKey2.get(columnName), columnName, dataType);
2828

2929
int cmp =
3030
order == Scan.Ordering.Order.ASC

core/src/main/java/com/scalar/db/storage/objectstorage/SelectStatementHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,12 @@ private boolean isReverseOrder(Scan scan, TableMetadata metadata) {
205205
throw new IllegalArgumentException(
206206
CoreError.OPERATION_CHECK_ERROR_ORDERING_NOT_PROPERLY_SPECIFIED.buildMessage(scan));
207207
}
208-
boolean rightOrder =
208+
boolean isValidOrder =
209209
ordering.getOrder() != metadata.getClusteringOrder(ordering.getColumnName());
210210
if (reverse == null) {
211-
reverse = rightOrder;
211+
reverse = isValidOrder;
212212
} else {
213-
if (reverse != rightOrder) {
213+
if (reverse != isValidOrder) {
214214
throw new IllegalArgumentException(
215215
CoreError.OPERATION_CHECK_ERROR_ORDERING_NOT_PROPERLY_SPECIFIED.buildMessage(scan));
216216
}

core/src/main/java/com/scalar/db/storage/objectstorage/StatementHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ protected void validateConditions(
128128
throw new ExecutionException(
129129
String.format(
130130
"A condition failed. ConditionalExpression: %s, Column: %s",
131-
expectedColumn, actualColumn));
131+
expression, actualColumn));
132132
}
133133
}
134134
}

0 commit comments

Comments
 (0)