From 83fb89418a28c7b7db60435950e2097e6879012c Mon Sep 17 00:00:00 2001 From: Jack Chueng <767407581@qq.com> Date: Sun, 27 Oct 2024 13:56:56 +0000 Subject: [PATCH] second round revision --- src/graph/executor/mutate/UpdateExecutor.cpp | 2 +- src/parser/MutateSentences.cpp | 1 - src/parser/parser.yy | 2 -- tests/Makefile | 8 ++++---- tests/tck/features/lookup/LookUpUpdate.feature | 1 - tests/tck/features/update/MultiUpdate.feature | 1 - tests/tck/features/update/Update.IntVid.feature | 1 - tests/tck/features/update/Update.feature | 1 - 8 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/graph/executor/mutate/UpdateExecutor.cpp b/src/graph/executor/mutate/UpdateExecutor.cpp index 4e316a2badf..0788909b23b 100644 --- a/src/graph/executor/mutate/UpdateExecutor.cpp +++ b/src/graph/executor/mutate/UpdateExecutor.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2024 vesoft inc. All rights reserved. +// Copyright (c) 2020 vesoft inc. All rights reserved. // // This source code is licensed under Apache 2.0 License. diff --git a/src/parser/MutateSentences.cpp b/src/parser/MutateSentences.cpp index 61f7d0c502c..2b2bf237740 100644 --- a/src/parser/MutateSentences.cpp +++ b/src/parser/MutateSentences.cpp @@ -209,7 +209,6 @@ std::string UpdateVertexSentence::toString() const { } else { buf += vertices_->toString(); } - buf += vid_->toString(); buf += " SET "; buf += updateList_->toString(); if (whenClause_ != nullptr) { diff --git a/src/parser/parser.yy b/src/parser/parser.yy index 249789607a6..e038b0c23af 100644 --- a/src/parser/parser.yy +++ b/src/parser/parser.yy @@ -3966,8 +3966,6 @@ query_unique_identifier mutate_sentence : insert_vertex_sentence { $$ = $1; } | insert_edge_sentence { $$ = $1; } - | update_vertex_sentence { $$ = $1; } - | update_edge_sentence { $$ = $1; } | download_sentence { $$ = $1; } | ingest_sentence { $$ = $1; } | admin_job_sentence { $$ = $1; } diff --git a/tests/Makefile b/tests/Makefile index 748ef1916f8..9f7249749b3 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -44,21 +44,21 @@ test_j_sa = $(test_without_skip_sa) -n$(J) install-deps: - pip3 install -Ur $(CURR_DIR)/requirements.txt -i $(PYPI_MIRROR) + pip3 install --user -Ur $(CURR_DIR)/requirements.txt -i $(PYPI_MIRROR) install-nebula-py: install-deps git clone --branch release-3.5 https://github.com/vesoft-inc/nebula-python $(CURR_DIR)/nebula-python cd $(CURR_DIR)/nebula-python \ - && pip3 install . -i $(PYPI_MIRROR) --upgrade + && pip3 install --user . -i $(PYPI_MIRROR) --upgrade rm -rf $(CURR_DIR)/nebula-python gherkin-fmt: install-deps @if [ $(PY_VERSION) -lt 7 ]; then echo 'Python version must >= 3.7'; exit 1; fi - pip3 install poetry + pip3 install --user poetry git clone --branch master https://github.com/OneContainer/reformat-gherkin $(CURR_DIR)/reformat-gherkin cd $(CURR_DIR)/reformat-gherkin && python3 -m poetry build pip3 uninstall -y reformat-gherkin - pip3 install $(CURR_DIR)/reformat-gherkin/dist/reformat_gherkin*.whl + pip3 install --user $(CURR_DIR)/reformat-gherkin/dist/reformat_gherkin*.whl rm -rf $(CURR_DIR)/reformat-gherkin init: clean install-nebula-py diff --git a/tests/tck/features/lookup/LookUpUpdate.feature b/tests/tck/features/lookup/LookUpUpdate.feature index 1bf8dedc9bb..c7ff7bb57cb 100644 --- a/tests/tck/features/lookup/LookUpUpdate.feature +++ b/tests/tck/features/lookup/LookUpUpdate.feature @@ -1,7 +1,6 @@ # Copyright (c) 2024 vesoft inc. All rights reserved. # # This source code is licensed under Apache 2.0 License. -@lookup_update Feature: lookup and update Background: diff --git a/tests/tck/features/update/MultiUpdate.feature b/tests/tck/features/update/MultiUpdate.feature index db45d643990..8eecc7173dc 100644 --- a/tests/tck/features/update/MultiUpdate.feature +++ b/tests/tck/features/update/MultiUpdate.feature @@ -1,7 +1,6 @@ # Copyright (c) 2024 vesoft inc. All rights reserved. # # This source code is licensed under Apache 2.0 License. -@multi_update Feature: Multi Update string vid of vertex and edge Background: Prepare space diff --git a/tests/tck/features/update/Update.IntVid.feature b/tests/tck/features/update/Update.IntVid.feature index 029212f07f2..51fa36f2381 100644 --- a/tests/tck/features/update/Update.IntVid.feature +++ b/tests/tck/features/update/Update.IntVid.feature @@ -1,7 +1,6 @@ # Copyright (c) 2020 vesoft inc. All rights reserved. # # This source code is licensed under Apache 2.0 License. -@update Feature: Update int vid of vertex and edge Scenario: update and upsert test diff --git a/tests/tck/features/update/Update.feature b/tests/tck/features/update/Update.feature index 188463b7727..5995985752e 100644 --- a/tests/tck/features/update/Update.feature +++ b/tests/tck/features/update/Update.feature @@ -1,7 +1,6 @@ # Copyright (c) 2020 vesoft inc. All rights reserved. # # This source code is licensed under Apache 2.0 License. -@update Feature: Update string vid of vertex and edge Background: Prepare space