Fixed CharRangeFilter to properly handle the new NULL_CHAR value (#1566)

* Fixed CharRangeFilter to properly handle the new NULL_CHAR. * Added a min and max value for char.
deephaven · Nov 16, 2021 · 53f9df8 · 53f9df8
1 parent 9f70fe5
commit 53f9df8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
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
@@ -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
@@ -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
@@ -11,6 +11,8 @@ namespace highlevel {
 class DeephavenConstants {
 public:
   static constexpr const char16_t NULL_CHAR = std::numeric_limits<char16_t>::max();
+  static constexpr const char16_t MIN_CHAR = std::numeric_limits<char16_t>::min();
+  static constexpr const char16_t MAX_CHAR = std::numeric_limits<char16_t>::max() - 1;
 
   static constexpr const float NULL_FLOAT = -std::numeric_limits<float>::max();
   static constexpr const float NAN_FLOAT = std::numeric_limits<float>::quiet_NaN();