[GIE/Runtime] Use IdEntry for opt; and refine the codes

alibaba · Jan 17, 2023 · f4761fb · f4761fb
1 parent dbf83dc
commit f4761fb
Show file tree

Hide file tree

Showing 12 changed files with 268 additions and 389 deletions.
diff --git a/interactive_engine/executor/ir/integrated/tests/expand_test.rs b/interactive_engine/executor/ir/integrated/tests/expand_test.rs
@@ -444,13 +444,9 @@ mod test {
         let expected_ids = vec![2, 4];
         let mut result_ids = vec![];
         while let Some(Ok(record)) = result.next() {
-            if let Some(element) = record.get(None).unwrap().as_vertex() {
+            if let Some(element) = record.get(None) {
                 result_ids.push(element.id() as usize);
-                assert!(element
-                    .details()
-                    .unwrap()
-                    .get_property(&"name".into())
-                    .is_none())
+                assert!(element.details().is_none())
             }
         }
         result_ids.sort();
@@ -493,13 +489,9 @@ mod test {
         let expected_ids = vec![1, 4, 4, 6];
         let mut result_ids = vec![];
         while let Some(Ok(record)) = result.next() {
-            if let Some(element) = record.get(None).unwrap().as_vertex() {
+            if let Some(element) = record.get(None) {
                 result_ids.push(element.id() as usize);
-                assert!(element
-                    .details()
-                    .unwrap()
-                    .get_property(&"name".into())
-                    .is_none())
+                assert!(element.details().is_none())
             }
         }
         result_ids.sort();
@@ -542,13 +534,9 @@ mod test {
         let expected_ids = vec![1, 1, 2, 4];
         let mut result_ids = vec![];
         while let Some(Ok(record)) = result.next() {
-            if let Some(element) = record.get(None).unwrap().as_vertex() {
+            if let Some(element) = record.get(None) {
                 result_ids.push(element.id() as usize);
-                assert!(element
-                    .details()
-                    .unwrap()
-                    .get_property(&"name".into())
-                    .is_none())
+                assert!(element.details().is_none())
             }
         }
         result_ids.sort();
@@ -591,13 +579,9 @@ mod test {
         let expected_ids = vec![1, 1, 2, 4];
         let mut result_ids = vec![];
         while let Some(Ok(record)) = result.next() {
-            if let Some(element) = record.get(None).unwrap().as_vertex() {
+            if let Some(element) = record.get(None) {
                 result_ids.push(element.id() as usize);
-                assert!(element
-                    .details()
-                    .unwrap()
-                    .get_property(&"name".into())
-                    .is_none())
+                assert!(element.details().is_none())
             }
         }
         result_ids.sort();
@@ -761,7 +745,7 @@ mod test {
             let mut result_collection: Vec<usize> = intersection
                 .clone()
                 .iter()
-                .map(|r| r.id() as usize)
+                .map(|r| *r as usize)
                 .collect();
             result_collection.sort();
             result_collections.push(result_collection);
@@ -839,7 +823,7 @@ mod test {
             let mut result_collection: Vec<DefaultId> = intersection
                 .clone()
                 .iter()
-                .map(|r| r.id() as DefaultId)
+                .map(|r| *r as DefaultId)
                 .collect();
             result_collection.sort();
             result_collections.push(result_collection);
@@ -912,7 +896,7 @@ mod test {
         let expected_ids = vec![v4];
         let mut result_ids = vec![];
         while let Some(Ok(record)) = result.next() {
-            if let Some(element) = record.get(None).unwrap().as_vertex() {
+            if let Some(element) = record.get(None) {
                 result_ids.push(element.id() as usize);
             }
         }
@@ -980,7 +964,7 @@ mod test {
         let mut expected_ids = vec![v1, v1, v3, v3, v4, v4];
         let mut result_ids = vec![];
         while let Some(Ok(record)) = result.next() {
-            if let Some(element) = record.get(None).unwrap().as_vertex() {
+            if let Some(element) = record.get(None) {
                 result_ids.push(element.id() as usize);
             }
         }
@@ -1058,7 +1042,7 @@ mod test {
         let mut expected_ids = vec![v4];
         let mut result_ids = vec![];
         while let Some(Ok(record)) = result.next() {
-            if let Some(element) = record.get(None).unwrap().as_vertex() {
+            if let Some(element) = record.get(None) {
                 result_ids.push(element.id() as usize);
             }
         }