rebase GIE

Signed-off-by: Lei Wang <[email protected]>

Author: doudoubobo

charts/gart/templates/gie_frontend/deployment.yaml

@@ -26,15 +26,16 @@ spec:
         command: ["/bin/bash", "-c"]
         args:
         - |
-          cd /home/graphscope/GART &&
-          export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python &&
-          ./scripts/update_gie_schema.py {{ $etcd_service }} {{ .Values.dataconfig.etcdPrefix }} {{ .Release.Namespace }} {{ include "gart.writer.fullname" . }} {{ .Values.gie_frontend.gremlinPort }} {{ .Values.dataconfig.subgraphNum}} {{ include "gart.fullname" . }}-gie-executor-service {{ .Values.gie_executor.GAIA_RPC_PORT}} &&
-          cd /home/graphscope/GraphScope/interactive_engine/compiler &&
-          make run &&
-          sleep infinity
+          cd /home/graphscope/GART
+          export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
+          ./scripts/update_gie_schema.py {{ $etcd_service }} {{ .Values.dataconfig.etcdPrefix }} {{ .Release.Namespace }} {{ include "gart.writer.fullname" . }} {{ .Values.gie_frontend.gremlinPort }} {{ .Values.dataconfig.subgraphNum}} {{ include "gart.fullname" . }}-gie-executor-service {{ .Values.gie_executor.GAIA_RPC_PORT}} {{ .Values.gie_frontend.cypherPort }}
+          cd /home/graphscope/GraphScope/interactive_engine/compiler
+          make run
         ports:
           - name: gremlin 
             containerPort: {{ .Values.gie_frontend.gremlinPort }}
+          - name: cypher
+            containerPort: {{ .Values.gie_frontend.cypherPort }}
         envFrom:
         - configMapRef:
             name: {{ include "gart.configmapName" . }}

charts/gart/templates/gie_frontend/svc.yaml

@@ -14,4 +14,9 @@ spec:
     - protocol: TCP
       port: {{ .Values.gie_frontend.gremlinPort }}
       targetPort: gremlin
+      name: gremlin-port
+    - protocol: TCP
+      port: {{ .Values.gie_frontend.cypherPort }}
+      targetPort: cypher
+      name: cypher-port
 {{- end }}

charts/gart/values.yaml

@@ -221,6 +221,7 @@ gie_frontend:
     pullPolicy: IfNotPresent
   replicaCount: 1
   gremlinPort: 8182
+  cypherPort: 7687
   resources: {}
 
 # gie executor config

coordinator/flex/server/controllers/graph_controller.py

@@ -576,7 +576,7 @@ def list_graphs():  # noqa: E501
     result_dict = get_graph_schema()
 
     if not result_dict:
-        return ([GetGraphResponse.from_dict({})], 200)
+        return ([], 200)
 
     try:
         with open("/tmp/graph_schema_create_time.txt", "r") as f:

k8s/dockerfiles/interactive.Dockerfile

@@ -81,7 +81,7 @@ RUN git clone https://github.com/microsoft/cpprestsdk.git \
 
 WORKDIR /home/graphscope
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
-    && git clone https://github.com/doudoubobo/GraphScope.git -b v0.1.4 /home/graphscope/GraphScope \
+    && git clone https://github.com/doudoubobo/GraphScope.git -b gart-gie-grin /home/graphscope/GraphScope \
     && cd /home/graphscope/GraphScope/interactive_engine/compiler \
     && make build \
     && rm -rf /home/graphscope/GraphScope/.git \
@@ -155,7 +155,7 @@ RUN git clone https://github.com/microsoft/cpprestsdk.git \
     && rm -rf /home/graphscope/GART
 
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
-    && git clone https://github.com/doudoubobo/GraphScope.git -b v0.1.4 /home/graphscope/GraphScope \
+    && git clone https://github.com/doudoubobo/GraphScope.git -b gart-gie-grin /home/graphscope/GraphScope \
     && cd /home/graphscope/GraphScope/interactive_engine/executor/assembly/grin_gart \
     && cargo build --release \
     && rm -rf /home/graphscope/GraphScope/.git \

scripts/launch_gie_executor.sh

@@ -13,4 +13,4 @@ APP_NAME="grin_executor"
 # Start the GIE executor
 cd /home/graphscope/GraphScope/interactive_engine/executor/assembly/grin_gart
 # run backgorund and redirect stdout and stderr to /home/graphscope/gie_executor.log
-./target/release/grin_executor ../../../assembly/src/conf/graphscope/log4rs.yml /home/graphscope/gie-executor-config.properties > /home/graphscope/gie_executor.log 2>&1 &
+./target/release/gart_executor ../../../assembly/src/conf/graphscope/log4rs.yml /home/graphscope/gie-executor-config.properties > /home/graphscope/gie_executor.log 2>&1 &

scripts/update_gie_schema.py

@@ -13,6 +13,7 @@
 server_size = sys.argv[6]
 rpc_service_name = sys.argv[7]
 rpc_service_port = sys.argv[8]
+cypher_port = sys.argv[9]
 
 server_size = int(server_size)
 
@@ -45,6 +46,13 @@
     f.write("pegasus.output.capacity: 16\n")
     f.write("graph.schema: /home/graphscope/gie-graph-schema.json\n")
     f.write("gremlin.server.port = " + gremlin_port + "\n")
+    f.write("graph.planner.is.on: true\n")
+    f.write("graph.planner.opt: RBO\n")
+    f.write("graph.planner.rules: FilterIntoJoinRule, FilterMatchRule, ExtendIntersectRule, ExpandGetVFusionRule\n")
+    f.write("gremlin.server.disabled: false\n")
+    f.write("neo4j.bolt.server.disabled: false\n")
+    f.write("neo4j.bolt.server.port: " + cypher_port + "\n")
+    f.write("calcite.default.charset: UTF-8\n")
     pegasus_hosts = ""
     for idx in range(server_size):
         service_name = (

scripts/update_ip_tables.sh

@@ -56,7 +56,11 @@ if ! update_iptables gart-release-coordinator-service 0.0.0.0 18080 gart "$K8S_A
 fi
 
 if ! update_iptables gart-release-gie-frontend-service 0.0.0.0 8182 gart "$K8S_API_IP"; then
-    echo "Failed to update iptables for gart-release-gie-frontend-service"
+    echo "Failed to update iptables for gart-release-gie-frontend-service gremlin"
+fi
+
+if ! update_iptables gart-release-gie-frontend-service 0.0.0.0 7687 gart "$K8S_API_IP"; then
+    echo "Failed to update iptables for gart-release-gie-frontend-service cypher"
 fi
 
 echo "iptables update process completed."