From 829e58009babedd3bf1c7762fcc756eec563442b Mon Sep 17 00:00:00 2001
From: Oussama Saoudi <oussama.saoudi@databricks.com>
Date: Wed, 6 Nov 2024 10:03:31 -0800
Subject: [PATCH] Fix precision smaller than scale and printing

---
 ffi/examples/visit-expression/expression.h       | 1 -
 ffi/examples/visit-expression/expression_print.h | 6 +++---
 ffi/src/expressions/kernel.rs                    | 2 +-
 ffi/src/test_ffi.rs                              | 2 +-
 ffi/tests/test-expression-visitor/expected.txt   | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ffi/examples/visit-expression/expression.h b/ffi/examples/visit-expression/expression.h
index 302566d10..eee88d1dc 100644
--- a/ffi/examples/visit-expression/expression.h
+++ b/ffi/examples/visit-expression/expression.h
@@ -5,7 +5,6 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 /**
diff --git a/ffi/examples/visit-expression/expression_print.h b/ffi/examples/visit-expression/expression_print.h
index 23c1dcb7b..7507c8de0 100644
--- a/ffi/examples/visit-expression/expression_print.h
+++ b/ffi/examples/visit-expression/expression_print.h
@@ -144,11 +144,11 @@ void print_tree_helper(ExpressionItem ref, int depth) {
         }
         case Decimal: {
           struct Decimal* dec = &lit->value.decimal;
-          printf("Decimal(%lld,%lld, %d, %d)\n",
+          printf("Decimal(%lld,%lld,%d,%d)\n",
                  (long long)dec->value[0],
                  (long long)dec->value[1],
-                 dec->scale,
-                 dec->precision);
+                 dec->precision,
+                 dec->scale);
           break;
         }
         case Null:
diff --git a/ffi/src/expressions/kernel.rs b/ffi/src/expressions/kernel.rs
index c4f5aaf0c..188d0d6a9 100644
--- a/ffi/src/expressions/kernel.rs
+++ b/ffi/src/expressions/kernel.rs
@@ -106,7 +106,7 @@ pub struct EngineExpressionVisitor {
     pub visit_literal_struct: extern "C" fn(
         data: *mut c_void,
         sibling_list_id: usize,
-        child_field_list_value: usize,
+        child_field_list_id: usize,
         child_value_list_id: usize,
     ),
     /// Visit an array literal belonging to the list identified by `sibling_list_id`.
diff --git a/ffi/src/test_ffi.rs b/ffi/src/test_ffi.rs
index fa7e2ef05..27c7063fa 100644
--- a/ffi/src/test_ffi.rs
+++ b/ffi/src/test_ffi.rs
@@ -61,7 +61,7 @@ pub unsafe extern "C" fn get_testing_kernel_expression() -> Handle<SharedExpress
         Scalar::Date(32).into(),
         Scalar::Binary(0x0000deadbeefcafeu64.to_be_bytes().to_vec()).into(),
         // Both the most and least significant u64 of the Decimal value will be 1
-        Scalar::Decimal((1 << 64) + 1, 2, 3).into(),
+        Scalar::Decimal((1 << 64) + 1, 5, 3).into(),
         Expr::null_literal(DataType::SHORT),
         Scalar::Struct(top_level_struct).into(),
         Scalar::Array(array_data).into(),
diff --git a/ffi/tests/test-expression-visitor/expected.txt b/ffi/tests/test-expression-visitor/expected.txt
index 4321df93d..b2ca11ee6 100644
--- a/ffi/tests/test-expression-visitor/expected.txt
+++ b/ffi/tests/test-expression-visitor/expected.txt
@@ -16,7 +16,7 @@ And
   TimestampNtz(100)
   Date(32)
   Binary(0000deadbeefcafe)
-  Decimal(1,1, 3, 2)
+  Decimal(1,1,5,3)
   Null
   Struct
     Field: top