fix: minor correction on value convertion for comparation in queries

orientechnologies · Jan 10, 2024 · efe5595 · efe5595
1 parent 81d9a88
commit efe5595
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OGeOperator.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OGeOperator.java
@@ -23,6 +23,7 @@
 
 package com.orientechnologies.orient.core.sql.parser;
 
+import com.orientechnologies.common.log.OLogManager;
 import com.orientechnologies.orient.core.metadata.schema.OType;
 import java.util.Map;
 
@@ -50,7 +51,13 @@ public boolean execute(Object iLeft, Object iRight) {
       iLeft = couple[0];
       iRight = couple[1];
     } else {
-      iRight = OType.convert(iRight, iLeft.getClass());
+      try {
+        iRight = OType.convert(iRight, iLeft.getClass());
+      } catch (RuntimeException e) {
+        // Can't convert to the target value.
+        OLogManager.instance()
+            .warn(this, "Issue converting value to target type, ignoring value", e);
+      }
     }
     if (iRight == null) return false;
     return ((Comparable<Object>) iLeft).compareTo(iRight) >= 0;

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OGtOperator.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OGtOperator.java
@@ -2,6 +2,7 @@
 /* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=true,TRACK_TOKENS=true,NODE_PREFIX=O,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 package com.orientechnologies.orient.core.sql.parser;
 
+import com.orientechnologies.common.log.OLogManager;
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
 import com.orientechnologies.orient.core.metadata.schema.OType;
 import java.util.Map;
@@ -27,7 +28,13 @@ public boolean execute(Object iLeft, Object iRight) {
       iLeft = couple[0];
       iRight = couple[1];
     } else {
-      iRight = OType.convert(iRight, iLeft.getClass());
+      try {
+        iRight = OType.convert(iRight, iLeft.getClass());
+      } catch (RuntimeException e) {
+        // Can't convert to the target value do nothing will return false
+        OLogManager.instance()
+            .warn(this, "Issue converting value to target type, ignoring value", e);
+      }
     }
     if (iRight == null) return false;
     if (iLeft instanceof OIdentifiable && !(iRight instanceof OIdentifiable)) {

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OLeOperator.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OLeOperator.java
@@ -2,6 +2,7 @@
 /* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=true,TRACK_TOKENS=true,NODE_PREFIX=O,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 package com.orientechnologies.orient.core.sql.parser;
 
+import com.orientechnologies.common.log.OLogManager;
 import com.orientechnologies.orient.core.metadata.schema.OType;
 import java.util.Map;
 
@@ -29,7 +30,13 @@ public boolean execute(Object iLeft, Object iRight) {
       iLeft = couple[0];
       iRight = couple[1];
     } else {
-      iRight = OType.convert(iRight, iLeft.getClass());
+      try {
+        iRight = OType.convert(iRight, iLeft.getClass());
+      } catch (RuntimeException e) {
+        // Can't convert to the target value do nothing will return false
+        OLogManager.instance()
+            .warn(this, "Issue converting value to target type, ignoring value", e);
+      }
     }
     if (iRight == null) return false;
     return ((Comparable<Object>) iLeft).compareTo(iRight) <= 0;

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OLtOperator.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OLtOperator.java
@@ -2,6 +2,7 @@
 /* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=true,TRACK_TOKENS=true,NODE_PREFIX=O,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 package com.orientechnologies.orient.core.sql.parser;
 
+import com.orientechnologies.common.log.OLogManager;
 import com.orientechnologies.orient.core.metadata.schema.OType;
 import java.util.Map;
 
@@ -26,7 +27,13 @@ public boolean execute(Object iLeft, Object iRight) {
       iLeft = couple[0];
       iRight = couple[1];
     } else {
-      iRight = OType.convert(iRight, iLeft.getClass());
+      try {
+        iRight = OType.convert(iRight, iLeft.getClass());
+      } catch (RuntimeException e) {
+        // Can't convert to the target value do nothing will return false
+        OLogManager.instance()
+            .warn(this, "Issue converting value to target type, ignoring value", e);
+      }
     }
     if (iRight == null) return false;
     return ((Comparable<Object>) iLeft).compareTo(iRight) < 0;