fix test

risingwavelabs · Mar 28, 2023 · e27e0e6 · e27e0e6
1 parent 1b0f6ed
commit e27e0e6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/src/common/src/row/owned_row.rs b/src/common/src/row/owned_row.rs
@@ -145,9 +145,9 @@ impl OwnedRow {
         }
     }
 
-    pub fn get_datetime(&self, idx: usize) -> &NaiveDateTimeWrapper {
+    pub fn get_datetime(&self, idx: usize) -> &Timestamp {
         match self[idx].as_ref().unwrap() {
-            ScalarImpl::NaiveDateTime(dt) => dt,
+            ScalarImpl::Timestamp(dt) => dt,
             _ => unreachable!("type is not NaiveDateTime at index: {}", idx),
         }
     }

diff --git a/src/java_binding/src/bin/data-chunk-payload-generator.rs b/src/java_binding/src/bin/data-chunk-payload-generator.rs
@@ -17,7 +17,7 @@ use std::io::Write;
 use prost::Message;
 use risingwave_common::array::{Op, StreamChunk};
 use risingwave_common::row::OwnedRow;
-use risingwave_common::types::{DataType, ScalarImpl, F32, F64};
+use risingwave_common::types::{DataType, ScalarImpl, Timestamp, F32, F64};
 use risingwave_common::util::chunk_coalesce::DataChunkBuilder;
 
 fn build_row(index: usize) -> OwnedRow {
@@ -31,8 +31,8 @@ fn build_row(index: usize) -> OwnedRow {
     row_value.push(Some(ScalarImpl::Utf8(
         format!("{}", index).repeat((index % 10) + 1).into(),
     )));
-    row_value.push(Some(ScalarImpl::NaiveDateTime(
-        NaiveDateTimeWrapper::from_timestamp_uncheck(index as _, 0),
+    row_value.push(Some(ScalarImpl::Timestamp(
+        Timestamp::from_timestamp_uncheck(index as _, 0),
     )));
     row_value.push(Some(ScalarImpl::Decimal(index.into())));
     row_value.push(if index % 5 == 0 {

diff --git a/src/java_binding/src/lib.rs b/src/java_binding/src/lib.rs
@@ -474,13 +474,12 @@ pub extern "system" fn Java_com_risingwave_java_binding_Binding_rowGetTimestampV
             .timestamp_class
             .get_or_try_init(|| {
                 let cls = env.find_class("java/sql/Timestamp")?;
-                Ok::<_, jni::errors::Error>(env.new_global_ref(cls)?)
+                env.new_global_ref(cls)
             })?;
         let ts_class = JClass::from(ts_class_ref.as_obj());
-        let constructor = INIT_METHOD
-            .get_or_try_init(|| env.get_method_id(ts_class, "<init>", "(J)V"))?
-            .clone();
-        let date_obj = env.new_object_unchecked(ts_class, constructor, &[millis.into()])?;
+        let constructor =
+            INIT_METHOD.get_or_try_init(|| env.get_method_id(ts_class, "<init>", "(J)V"))?;
+        let date_obj = env.new_object_unchecked(ts_class, *constructor, &[millis.into()])?;
 
         Ok(date_obj)
     })
@@ -502,16 +501,14 @@ pub extern "system" fn Java_com_risingwave_java_binding_Binding_rowGetDecimalVal
             .big_decimal_class
             .get_or_try_init(|| {
                 let cls = env.find_class("java/math/BigDecimal")?;
-                Ok::<_, jni::errors::Error>(env.new_global_ref(cls)?)
+                env.new_global_ref(cls)
             })?;
         let decimal_class = JClass::from(ts_class_ref.as_obj());
-        let constructor = INIT_METHOD
-            .get_or_try_init(|| {
-                env.get_method_id(decimal_class, "<init>", "(Ljava/lang/String;)V")
-            })?
-            .clone();
+        let constructor = INIT_METHOD.get_or_try_init(|| {
+            env.get_method_id(decimal_class, "<init>", "(Ljava/lang/String;)V")
+        })?;
         let date_obj =
-            env.new_object_unchecked(decimal_class, constructor, &[string_value.into()])?;
+            env.new_object_unchecked(decimal_class, *constructor, &[string_value.into()])?;
 
         Ok(date_obj)
     })