build(deps): update socketcan requirement from 1.7 to 2.0

springql-core/Cargo.toml

@@ -38,7 +38,7 @@ reqwest = {version = "0.11", features = ["json", "blocking"], default-features =
 once_cell = "1.8"
 parking_lot = "0.12"
 time = {version="0.3.9", features = ["formatting", "parsing", "macros"]}
-socketcan = "1.7"
+socketcan = "2.0"
 
 [dev-dependencies]
 springql-config = {version="0.18.0", features= ["toml"], path="../springql-config"}

springql-core/src/stream_engine/autonomous_executor/row/foreign_row/source_row/can_frame_source_row.rs

@@ -1,6 +1,6 @@
 // This file is part of https://github.com/SpringQL/SpringQL which is licensed under MIT OR Apache-2.0. See file LICENSE-MIT or LICENSE-APACHE for full license details.
 
-use socketcan::CANFrame;
+use socketcan::{CanFrame, EmbeddedFrame, Frame};
 
 use crate::{
     api::error::Result,
@@ -15,7 +15,7 @@ use crate::{
 ///
 /// Immediately converted into `Row` on stream-engine boundary.
 #[derive(Clone, Debug, new)]
-pub struct CANFrameSourceRow(CANFrame);
+pub struct CANFrameSourceRow(CanFrame);
 
 impl CANFrameSourceRow {
     /// # Failure
@@ -31,7 +31,7 @@ impl CANFrameSourceRow {
         let can_frame = self.0;
         let mut column_values = ColumnValues::default();
 
-        let can_id_value = SqlValue::NotNull(NnSqlValue::UnsignedInteger(can_frame.id()));
+        let can_id_value = SqlValue::NotNull(NnSqlValue::UnsignedInteger(can_frame.raw_id()));
         column_values
             .insert(ColumnName::new("can_id".to_string()), can_id_value)
             .expect("can_id must not duplicate");

springql-core/src/stream_engine/autonomous_executor/task/source_task/source_reader/can.rs

@@ -3,7 +3,7 @@
 use std::time::Duration;
 
 use anyhow::{anyhow, Context};
-use socketcan::{CANFrame, CANSocket, ShouldRetry};
+use socketcan::{CanFrame, CanSocket, EmbeddedFrame, Frame, ShouldRetry, Socket};
 
 use crate::{
     api::{
@@ -23,7 +23,7 @@
 #[derive(Debug)]
 pub(in crate::stream_engine) struct CANSourceReader {
     interface: String,
-    can_socket: CANSocket,
+    can_socket: CanSocket,
 }
 
 impl SourceReader for CANSourceReader {
@@ -36,7 +36,7 @@
 
         let interface = &options.interface;
 
-        let can_socket = CANSocket::open(interface)
+        let can_socket = CanSocket::open(interface)
             .context(format!(
                 "failed to open socket CAN interface {}",
                 &interface
@@ -92,22 +92,22 @@
 }
 
 impl CANSourceReader {
-    fn can_frame_into_row(&self, frame: CANFrame) -> Result<SourceRow> {
-        if frame.is_rtr() {
+    fn can_frame_into_row(&self, frame: CanFrame) -> Result<SourceRow> {
+        if frame.is_remote_frame() {
             unimplemented!("RTR (remote transmission request) frames are not supported");
         } else if frame.is_extended() {
             unimplemented!("Extended frame format is not supported");
-        } else if frame.is_error() {
+        } else if frame.is_error_frame() {
             Err(SpringError::ForeignIo {
-                source: anyhow!("got a error CAN frame (CAN ID: {})", frame.id()),
+                source: anyhow!("got a error CAN frame (CAN ID: {:?})", frame.id()),
                 foreign_info: ForeignInfo::SocketCAN(self.interface.clone()),
             })
         } else {
             Ok(Self::_can_frame_into_row(frame))
         }
     }
 
-    fn _can_frame_into_row(frame: CANFrame) -> SourceRow {
+    fn _can_frame_into_row(frame: CanFrame) -> SourceRow {
         SourceRow::CANFrame(CANFrameSourceRow::new(frame))
     }
 }
@@ -116,6 +116,7 @@
 mod tests {
 
     use crate::stream_engine::{autonomous_executor::row::SchemalessRow, SqlValue};
+    use socketcan::ExtendedId;
 
     use super::*;
 
@@ -124,7 +125,7 @@
         let can_id = 1;
         let can_data = &[0x00u8, 0x01];
 
-        let frame = CANFrame::new(can_id, can_data, false, false).unwrap();
+        let frame = CanFrame::new(ExtendedId::new(can_id).unwrap(), can_data).unwrap();
         let source_row = CANSourceReader::_can_frame_into_row(frame);
         let row = SchemalessRow::try_from(source_row).unwrap();