Merge branch 'main' into ir_path_subgraph

alibaba · Sep 21, 2023 · edea05e · edea05e
2 parents 0f123f9 + 9f012b7
commit edea05e
Show file tree

Hide file tree

Showing 13 changed files with 246 additions and 70 deletions.
diff --git a/interactive_engine/assembly/src/conf/groot/logback.xml b/interactive_engine/assembly/src/conf/groot/logback.xml
@@ -1,30 +1,31 @@
 <configuration scan="true" scanPeriod="30 seconds">
+    <define name="hostname" class="ch.qos.logback.core.property.CanonicalHostNamePropertyDefiner"/>
     <property name="log_dir" value="${log.dir:-/var/log/graphscope}"/>
     <property name="log_name" value="${log.name:-groot}"/>
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log_dir}/${log_name}.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${log_dir}/${log_name}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <maxFileSize>100MB</maxFileSize>
-            <maxHistory>60</maxHistory>
-            <totalSizeCap>10GB</totalSizeCap>
+            <maxHistory>10</maxHistory>
+            <totalSizeCap>1GB</totalSizeCap>
         </rollingPolicy>
         <encoder>
-            <pattern>[%d{ISO8601}][%p][%t][%c:%L] %m%n</pattern>
+            <pattern>[%d{ISO8601}][%p][%t][${hostname}][%c:%L] %m%n</pattern>
         </encoder>
     </appender>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>[%d{ISO8601}][%p][%t][%c:%L] %m%n</pattern>
+            <pattern>[%d{ISO8601}][%p][%t][${hostname}][%c:%L] %m%n</pattern>
         </encoder>
     </appender>
     <appender name="Metric" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${log_dir}/metric.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <fileNamePattern>${log_dir}/metric.log.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <maxFileSize>100MB</maxFileSize>
-            <maxHistory>60</maxHistory>
-            <totalSizeCap>10GB</totalSizeCap>
+            <maxHistory>10</maxHistory>
+            <totalSizeCap>1GB</totalSizeCap>
         </rollingPolicy>
         <encoder>
             <pattern>%m%n</pattern>

diff --git a/interactive_engine/executor/assembly/groot/src/store/graph.rs b/interactive_engine/executor/assembly/groot/src/store/graph.rs
@@ -368,7 +368,7 @@ fn delete_vertex<G: MultiVersionGraph>(graph: &G, snapshot_id: i64, op: &Operati
 }
 
 fn overwrite_edge<G: MultiVersionGraph>(graph: &G, snapshot_id: i64, op: &OperationPb) -> GraphResult<()> {
-    trace!("overwrite_edge");
+    debug!("overwrite_edge");
     let data_operation_pb = parse_pb::<DataOperationPb>(op.get_dataBytes())?;
 
     let edge_id_pb = parse_pb::<EdgeIdPb>(data_operation_pb.get_keyBlob())?;
@@ -388,7 +388,7 @@ fn overwrite_edge<G: MultiVersionGraph>(graph: &G, snapshot_id: i64, op: &Operat
 }
 
 fn update_edge<G: MultiVersionGraph>(graph: &G, snapshot_id: i64, op: &OperationPb) -> GraphResult<()> {
-    trace!("update_edge");
+    debug!("update_edge");
     let data_operation_pb = parse_pb::<DataOperationPb>(op.get_dataBytes())?;
 
     let edge_id_pb = parse_pb::<EdgeIdPb>(data_operation_pb.get_keyBlob())?;
@@ -405,7 +405,7 @@ fn update_edge<G: MultiVersionGraph>(graph: &G, snapshot_id: i64, op: &Operation
 fn clear_edge_properties<G: MultiVersionGraph>(
     graph: &G, snapshot_id: i64, op: &OperationPb,
 ) -> GraphResult<()> {
-    trace!("update_edge");
+    debug!("clear_edge_properties");
     let data_operation_pb = parse_pb::<DataOperationPb>(op.get_dataBytes())?;
 
     let edge_id_pb = parse_pb::<EdgeIdPb>(data_operation_pb.get_keyBlob())?;
@@ -420,7 +420,7 @@ fn clear_edge_properties<G: MultiVersionGraph>(
 }
 
 fn delete_edge<G: MultiVersionGraph>(graph: &G, snapshot_id: i64, op: &OperationPb) -> GraphResult<()> {
-    trace!("delete_edge");
+    debug!("delete_edge");
     let data_operation_pb = parse_pb::<DataOperationPb>(op.get_dataBytes())?;
 
     let edge_id_pb = parse_pb::<EdgeIdPb>(data_operation_pb.get_keyBlob())?;

diff --git a/interactive_engine/executor/common/dyn_type/src/serde.rs b/interactive_engine/executor/common/dyn_type/src/serde.rs
@@ -17,10 +17,10 @@ use std::any::TypeId;
 use std::collections::BTreeMap;
 use std::io;
 
+use chrono::{Datelike, Timelike};
 use pegasus_common::codec::{Decode, Encode, ReadExt, WriteExt};
 
 use crate::{de_dyn_obj, DateTimeFormats, Object, Primitives};
-use chrono::{Datelike, Timelike};
 
 impl Encode for Primitives {
     fn write_to<W: WriteExt>(&self, writer: &mut W) -> io::Result<()> {

diff --git a/interactive_engine/executor/ir/core/src/plan/logical.rs b/interactive_engine/executor/ir/core/src/plan/logical.rs
@@ -20,13 +20,12 @@ use std::fmt;
 use std::iter::FromIterator;
 use std::rc::Rc;
 
+use fraction::Fraction;
 use ir_common::error::ParsePbError;
 use ir_common::generated::algebra as pb;
 use ir_common::generated::algebra::pattern::binder::Item;
 use ir_common::generated::common as common_pb;
 use ir_common::{KeyId, LabelId, NameOrId};
-
-use fraction::Fraction;
 use vec_map::VecMap;
 
 use crate::error::{IrError, IrResult};
@@ -1580,7 +1579,7 @@ impl AsLogical for pb::Unfold {
             let curr_node = plan_meta.get_curr_node();
             let tag_id = get_or_set_tag_id(tag, plan_meta)?;
             // plan_meta.set_tag_nodes(tag_id, plan_meta.get_curr_referred_nodes().to_vec());
-            
+
             let tag_nodes = plan_meta.get_tag_nodes(tag_id).to_vec();
             plan_meta.refer_to_nodes(curr_node, tag_nodes.clone());
         }

diff --git a/interactive_engine/executor/store/groot/src/api/mod.rs b/interactive_engine/executor/store/groot/src/api/mod.rs
@@ -14,7 +14,7 @@
 //! limitations under the License.
 
 pub mod condition;
-mod elem;
+pub mod elem;
 mod filter;
 mod multi_version;
 pub mod prelude;

diff --git a/interactive_engine/executor/store/groot/src/db/graph/iter.rs b/interactive_engine/executor/store/groot/src/db/graph/iter.rs
@@ -182,12 +182,13 @@ impl IntoIterator for EdgeKindScan {
                     {
                         Ok(decoder) => {
                             let edge_kind = self.edge_kind_info.get_type();
-                            Some(Ok(RocksEdgeImpl::new(
+                            let edge = RocksEdgeImpl::new(
                                 edge_id.into(),
                                 edge_kind.into(),
                                 Some(decoder),
                                 raw_val,
-                            )))
+                            );
+                            Some(Ok(edge))
                         }
                         Err(e) => Some(Err(e.into())),
                     }