remove unnecessary type para in PrimitiveArrayGenerator.

Author: LeslieKid

datafusion/core/tests/fuzz_cases/aggregation_fuzzer/data_generator.rs

@@ -226,7 +226,7 @@ macro_rules! generate_string_array {
 }
 
 macro_rules! generate_primitive_array {
-    ($SELF:ident, $NUM_ROWS:ident, $BATCH_GEN_RNG:ident, $ARRAY_GEN_RNG:ident, $DATA_TYPE:ident, $ARROW_TYPE:ident) => {
+    ($SELF:ident, $NUM_ROWS:ident, $BATCH_GEN_RNG:ident, $ARRAY_GEN_RNG:ident, $ARROW_TYPE:ident) => {
         paste::paste! {{
             let null_pct_idx = $BATCH_GEN_RNG.gen_range(0..$SELF.candidate_null_pcts.len());
             let null_pct = $SELF.candidate_null_pcts[null_pct_idx];
@@ -243,7 +243,7 @@ macro_rules! generate_primitive_array {
                 rng: $ARRAY_GEN_RNG,
             };
 
-            generator.gen_data::<$DATA_TYPE, $ARROW_TYPE>()
+            generator.gen_data::<$ARROW_TYPE>()
     }}}
 }
 
@@ -301,7 +301,6 @@ impl RecordBatchGenerator {
                     num_rows,
                     batch_gen_rng,
                     array_gen_rng,
-                    i8,
                     Int8Type
                 )
             }
@@ -311,7 +310,6 @@ impl RecordBatchGenerator {
                     num_rows,
                     batch_gen_rng,
                     array_gen_rng,
-                    i16,
                     Int16Type
                 )
             }
@@ -321,7 +319,6 @@ impl RecordBatchGenerator {
                     num_rows,
                     batch_gen_rng,
                     array_gen_rng,
-                    i32,
                     Int32Type
                 )
             }
@@ -331,7 +328,6 @@ impl RecordBatchGenerator {
                     num_rows,
                     batch_gen_rng,
                     array_gen_rng,
-                    i64,
                     Int64Type
                 )
             }
@@ -341,7 +337,6 @@ impl RecordBatchGenerator {
                     num_rows,
                     batch_gen_rng,
                     array_gen_rng,
-                    u8,
                     UInt8Type
                 )
             }
@@ -351,7 +346,6 @@ impl RecordBatchGenerator {
                     num_rows,
                     batch_gen_rng,
                     array_gen_rng,
-                    u16,
                     UInt16Type
                 )
             }
@@ -361,7 +355,6 @@ impl RecordBatchGenerator {
                     num_rows,
                     batch_gen_rng,
                     array_gen_rng,
-                    u32,
                     UInt32Type
                 )
             }
@@ -371,7 +364,6 @@ impl RecordBatchGenerator {
                     num_rows,
                     batch_gen_rng,
                     array_gen_rng,
-                    u64,
                     UInt64Type
                 )
             }
@@ -381,7 +373,6 @@ impl RecordBatchGenerator {
                     num_rows,
                     batch_gen_rng,
                     array_gen_rng,
-                    f32,
                     Float32Type
                 )
             }
@@ -391,7 +382,6 @@ impl RecordBatchGenerator {
                     num_rows,
                     batch_gen_rng,
                     array_gen_rng,
-                    f64,
                     Float64Type
                 )
             }
@@ -401,7 +391,6 @@ impl RecordBatchGenerator {
                     num_rows,
                     batch_gen_rng,
                     array_gen_rng,
-                    i32,
                     Date32Type
                 )
             }
@@ -411,7 +400,6 @@ impl RecordBatchGenerator {
                     num_rows,
                     batch_gen_rng,
                     array_gen_rng,
-                    i64,
                     Date64Type
                 )
             }

test-utils/src/array_gen/primitive.rs

@@ -36,11 +36,10 @@ pub struct PrimitiveArrayGenerator {
 
 // TODO: support generating more primitive arrays
 impl PrimitiveArrayGenerator {
-    pub fn gen_data<N, A>(&mut self) -> ArrayRef
+    pub fn gen_data<A>(&mut self) -> ArrayRef
     where
-        A: ArrowPrimitiveType<Native = N>,
-        N: std::marker::Sync + std::marker::Send,
-        Standard: Distribution<N>,
+        A: ArrowPrimitiveType,
+        Standard: Distribution<<A as ArrowPrimitiveType>::Native>,
     {
         // table of primitives from which to draw
         let distinct_primitives: PrimitiveArray<A> = (0..self.num_distinct_primitives)
@@ -56,16 +55,19 @@ impl PrimitiveArrayGenerator {
                     | DataType::UInt64
                     | DataType::Float32
                     | DataType::Float64
-                    | DataType::Date32 => self.rng.gen::<N>(),
+                    | DataType::Date32 => self.rng.gen::<A::Native>(),
 
                     DataType::Date64 => {
                         // TODO: constrain this range to valid dates if necessary
                         let date_value = self.rng.gen_range(i64::MIN..=i64::MAX);
                         let millis_per_day: i64 = 86_400_000;
                         let adjusted_value = date_value - (date_value % millis_per_day);
-                        // SAFETY: here we can convert i64 to N safely since we determine that the type N is i64
+                        // SAFETY: here we can convert i64 to A::Native safely since we determine that
+                        // the type A::Native is i64
                         unsafe {
-                            std::ptr::read(&adjusted_value as *const i64 as *const N)
+                            std::ptr::read(
+                                &adjusted_value as *const i64 as *const A::Native,
+                            )
                         }
                     }