diff --git a/DB/src/main/java/io/deephaven/db/v2/select/CharRangeFilter.java b/DB/src/main/java/io/deephaven/db/v2/select/CharRangeFilter.java index e01dc441a49..f2b07cc288c 100644 --- a/DB/src/main/java/io/deephaven/db/v2/select/CharRangeFilter.java +++ b/DB/src/main/java/io/deephaven/db/v2/select/CharRangeFilter.java @@ -35,9 +35,9 @@ static SelectFilter makeCharRangeFilter(String columnName, Condition condition, case LESS_THAN_OR_EQUAL: return new CharRangeFilter(columnName, RangeConditionFilter.parseCharFilter(value), QueryConstants.NULL_CHAR, true, true); case GREATER_THAN: - return new CharRangeFilter(columnName, RangeConditionFilter.parseCharFilter(value), Character.MAX_VALUE, false, true); + return new CharRangeFilter(columnName, RangeConditionFilter.parseCharFilter(value), QueryConstants.MAX_CHAR, false, true); case GREATER_THAN_OR_EQUAL: - return new CharRangeFilter(columnName, RangeConditionFilter.parseCharFilter(value), Character.MAX_VALUE, true, true); + return new CharRangeFilter(columnName, RangeConditionFilter.parseCharFilter(value), QueryConstants.MAX_CHAR, true, true); default: throw new IllegalArgumentException("RangeConditionFilter does not support condition " + condition); } diff --git a/Util/src/main/java/io/deephaven/util/QueryConstants.java b/Util/src/main/java/io/deephaven/util/QueryConstants.java index 0198bcfdc7d..3e8d6d539f2 100644 --- a/Util/src/main/java/io/deephaven/util/QueryConstants.java +++ b/Util/src/main/java/io/deephaven/util/QueryConstants.java @@ -36,6 +36,16 @@ private QueryConstants() {} */ public static final Character NULL_CHAR_BOXED = NULL_CHAR; + /** + * Minimum value of type char. + */ + public static final char MIN_CHAR = Character.MIN_VALUE; + + /** + * Maximum value of type char. + */ + public static final char MAX_CHAR = Character.MAX_VALUE - 1; + ///////////////////////////////////////////////////////////////// diff --git a/cpp-client/deephaven/client/include/public/deephaven/client/highlevel/types.h b/cpp-client/deephaven/client/include/public/deephaven/client/highlevel/types.h index 350c3c22f1e..e8408b913d2 100644 --- a/cpp-client/deephaven/client/include/public/deephaven/client/highlevel/types.h +++ b/cpp-client/deephaven/client/include/public/deephaven/client/highlevel/types.h @@ -11,6 +11,8 @@ namespace highlevel { class DeephavenConstants { public: static constexpr const char16_t NULL_CHAR = std::numeric_limits::max(); + static constexpr const char16_t MIN_CHAR = std::numeric_limits::min(); + static constexpr const char16_t MAX_CHAR = std::numeric_limits::max() - 1; static constexpr const float NULL_FLOAT = -std::numeric_limits::max(); static constexpr const float NAN_FLOAT = std::numeric_limits::quiet_NaN();