From dab1afa3cc81f4bc37b6ab21ae489e180a367e8f Mon Sep 17 00:00:00 2001
From: neza2017 <yefu.chen@zilliz.com>
Date: Sat, 21 Nov 2020 17:53:05 +0800
Subject: [PATCH] Add unittest and fix a bug in segment manager

Signed-off-by: neza2017 <yefu.chen@zilliz.com>
---
 .devcontainer.json                    | 7 ++++---
 .env                                  | 4 ++--
 .github/workflows/main.yaml           | 2 +-
 deployments/docker/docker-compose.yml | 7 +++++++
 docker-compose.yml                    | 8 +++++++-
 scripts/run_clang_format.sh           | 6 ++++++
 6 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/.devcontainer.json b/.devcontainer.json
index 93a5a3427..08e822d85 100644
--- a/.devcontainer.json
+++ b/.devcontainer.json
@@ -7,7 +7,8 @@
     "remoteUser": "debugger",
     "remoteEnv": {"CCACHE_COMPILERCHECK":"content", "CCACHE_MAXSIZE": "2G", "CCACHE_COMPRESS": "1", "CCACHE_COMPRESSLEVEL": "5"},
     "extensions": [
-		"ms-vscode.cpptools",
-		"golang.go"
-	]
+      "ms-vscode.cmake-tools",
+      "ms-vscode.cpptools",
+      "golang.go"
+    ]
 }
diff --git a/.env b/.env
index b9665f3cd..2a864a6eb 100644
--- a/.env
+++ b/.env
@@ -3,6 +3,6 @@ ARCH=amd64
 UBUNTU=18.04
 DATE_VERSION=20201120-092740
 LATEST_DATE_VERSION=latest
-PULSAR_ADDRESS=pulsar://localhost:6650
-ETCD_ADDRESS=localhost:2379
+PULSAR_ADDRESS=pulsar://pulsar:6650
+ETCD_ADDRESS=etcd:2379
 MASTER_ADDRESS=localhost:53100
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index e48cb1efc..4522df665 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -57,7 +57,7 @@ jobs:
       - name: Start Service
         shell: bash
         run: |
-          cd ${GITHUB_WORKSPACE}/deployments/docker && docker-compose up -d
+          cd ${GITHUB_WORKSPACE}/deployments/docker && docker-compose -p milvus-distributed up -d
       - name: Build and UnitTest
         env:
           CHECK_BUILDER: "1"
diff --git a/deployments/docker/docker-compose.yml b/deployments/docker/docker-compose.yml
index e801ddfc8..cec6fb659 100644
--- a/deployments/docker/docker-compose.yml
+++ b/deployments/docker/docker-compose.yml
@@ -8,6 +8,8 @@ services:
       - "2379:2379"
       - "2380:2380"
       - "4001:4001"
+    networks:
+      - milvus
 
   pulsar:
     image: apachepulsar/pulsar:latest
@@ -15,6 +17,11 @@ services:
     ports:
       - "6650:6650"
       - "18080:8080"
+    networks:
+      - milvus
+
+networks:
+  milvus:
 
 #  pd0:
 #    image: pingcap/pd:latest
diff --git a/docker-compose.yml b/docker-compose.yml
index 5d10dd101..862b4b229 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,6 @@ x-ccache: &ccache
 services:
   ubuntu:
     image: ${REPO}:${ARCH}-ubuntu${UBUNTU}-${DATE_VERSION}
-    network_mode: "host"
     build:
       context: .
       dockerfile: build/docker/env/cpu/ubuntu${UBUNTU}/Dockerfile
@@ -29,6 +28,8 @@ services:
     command: &ubuntu-command >
       /bin/bash -c "
         make check-proto-product && make verifiers && make unittest"
+    networks:
+      - milvus
 
   gdbserver:
     image: ${REPO}:${ARCH}-ubuntu${UBUNTU}-${DATE_VERSION}
@@ -52,3 +53,8 @@ services:
     ports:
       - "7776:22"
       - "7777:7777"
+    networks:
+      - milvus
+
+networks:
+  milvus:
diff --git a/scripts/run_clang_format.sh b/scripts/run_clang_format.sh
index 6c9d88a83..5d09b80a2 100755
--- a/scripts/run_clang_format.sh
+++ b/scripts/run_clang_format.sh
@@ -11,3 +11,9 @@ formatThis() {
 formatThis "${CorePath}/src"
 formatThis "${CorePath}/unittest"
 
+if test -z "$(git status | grep -E "*\.c|*\.h")"; then
+  exit 0
+else
+  echo "Please format your code by clang-format!"
+  exit 1
+fi
-- 
GitLab