s3select: bug fix modulo (#144)

fix for modulo involving floating point numbers Albin Antony <[email protected]>
ceph · Jan 31, 2024 · f7ed12f · f7ed12f
1 parent aef094b
commit f7ed12f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/include/s3select_oper.h b/include/s3select_oper.h
@@ -389,7 +389,20 @@ struct binop_modulo
     {
       throw base_s3select_exception("Mod zero is not allowed");
     } else {
-      return a % b;
+      return a % b;     
+    }
+  }
+};
+
+struct binop_float_modulo
+{
+  double operator()(double a, double b)
+  {
+    if (b == 0)
+    {
+      throw base_s3select_exception("Mod zero is not allowed");
+    } else {
+      return fmod(a, b);     
     }
   }
 };
@@ -1098,8 +1111,10 @@ class value
 
   value & operator%(const value &v)
   {
-    if(v.type == value_En_t::DECIMAL) {
+    if(v.type == value_En_t::DECIMAL && this->type == value_En_t::DECIMAL) {
       return compute<binop_modulo>(*this,v);
+    } else if(v.type == value_En_t::FLOAT || this->type == value_En_t::FLOAT) {
+      return compute<binop_float_modulo>(*this,v);
     } else {
       throw base_s3select_exception("wrong use of modulo operation!");
     }

diff --git a/test/s3select_test.cpp b/test/s3select_test.cpp
@@ -2070,6 +2070,12 @@ TEST(TestS3selectFunctions, mod)
 test_single_column_single_row( "select 5%2 from stdin;","1\n");
 }
 
+TEST(TestS3selectFunctions, modfloat)
+{
+test_single_column_single_row( "select 5.2%2 from stdin;","1.2000000000000002\n");
+test_single_column_single_row( "select 5.2%2.5 from stdin;","0.20000000000000018\n");
+}
+
 TEST(TestS3selectFunctions, modzero)
 {
 test_single_column_single_row( "select 0%2 from stdin;","0\n");