Compare commits
4 Commits
fix-stress
...
release/2.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
375c3c5ddd | ||
|
|
340057f959 | ||
|
|
e56e516f94 | ||
|
|
7a9c4f5ec4 |
116
.github/workflows/release_debian10.yaml
vendored
116
.github/workflows/release_debian10.yaml
vendored
@@ -178,7 +178,7 @@ jobs:
|
||||
|
||||
release_build:
|
||||
name: "Release build"
|
||||
runs-on: [self-hosted, Linux, X64, Debian10]
|
||||
runs-on: [self-hosted, Linux, X64, Debian10, BigMemory]
|
||||
env:
|
||||
THREADS: 24
|
||||
MEMGRAPH_ENTERPRISE_LICENSE: ${{ secrets.MEMGRAPH_ENTERPRISE_LICENSE }}
|
||||
@@ -231,73 +231,73 @@ jobs:
|
||||
name: "Enterprise DEB package"
|
||||
path: build/output/memgraph*.deb
|
||||
|
||||
# - name: Run micro benchmark tests
|
||||
# run: |
|
||||
# # Activate toolchain.
|
||||
# source /opt/toolchain-v4/activate
|
||||
- name: Run micro benchmark tests
|
||||
run: |
|
||||
# Activate toolchain.
|
||||
source /opt/toolchain-v4/activate
|
||||
|
||||
# # Run micro benchmark tests.
|
||||
# cd build
|
||||
# # The `eval` benchmark needs a large stack limit.
|
||||
# ulimit -s 262144
|
||||
# ctest -R memgraph__benchmark -V
|
||||
# Run micro benchmark tests.
|
||||
cd build
|
||||
# The `eval` benchmark needs a large stack limit.
|
||||
ulimit -s 262144
|
||||
ctest -R memgraph__benchmark -V
|
||||
|
||||
# - name: Run macro benchmark tests
|
||||
# run: |
|
||||
# cd tests/macro_benchmark
|
||||
# ./harness QuerySuite MemgraphRunner \
|
||||
# --groups aggregation 1000_create unwind_create dense_expand match \
|
||||
# --no-strict
|
||||
- name: Run macro benchmark tests
|
||||
run: |
|
||||
cd tests/macro_benchmark
|
||||
./harness QuerySuite MemgraphRunner \
|
||||
--groups aggregation 1000_create unwind_create dense_expand match \
|
||||
--no-strict
|
||||
|
||||
# - name: Run parallel macro benchmark tests
|
||||
# run: |
|
||||
# cd tests/macro_benchmark
|
||||
# ./harness QueryParallelSuite MemgraphRunner \
|
||||
# --groups aggregation_parallel create_parallel bfs_parallel \
|
||||
# --num-database-workers 9 --num-clients-workers 30 \
|
||||
# --no-strict
|
||||
- name: Run parallel macro benchmark tests
|
||||
run: |
|
||||
cd tests/macro_benchmark
|
||||
./harness QueryParallelSuite MemgraphRunner \
|
||||
--groups aggregation_parallel create_parallel bfs_parallel \
|
||||
--num-database-workers 9 --num-clients-workers 30 \
|
||||
--no-strict
|
||||
|
||||
# - name: Run GQL Behave tests
|
||||
# run: |
|
||||
# cd tests
|
||||
# ./setup.sh /opt/toolchain-v4/activate
|
||||
# cd gql_behave
|
||||
# ./continuous_integration
|
||||
- name: Run GQL Behave tests
|
||||
run: |
|
||||
cd tests
|
||||
./setup.sh /opt/toolchain-v4/activate
|
||||
cd gql_behave
|
||||
./continuous_integration
|
||||
|
||||
# - name: Save quality assurance status
|
||||
# uses: actions/upload-artifact@v3
|
||||
# with:
|
||||
# name: "GQL Behave Status"
|
||||
# path: |
|
||||
# tests/gql_behave/gql_behave_status.csv
|
||||
# tests/gql_behave/gql_behave_status.html
|
||||
- name: Save quality assurance status
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: "GQL Behave Status"
|
||||
path: |
|
||||
tests/gql_behave/gql_behave_status.csv
|
||||
tests/gql_behave/gql_behave_status.html
|
||||
|
||||
# - name: Run unit tests
|
||||
# run: |
|
||||
# # Activate toolchain.
|
||||
# source /opt/toolchain-v4/activate
|
||||
- name: Run unit tests
|
||||
run: |
|
||||
# Activate toolchain.
|
||||
source /opt/toolchain-v4/activate
|
||||
|
||||
# # Run unit tests.
|
||||
# cd build
|
||||
# ctest -R memgraph__unit --output-on-failure
|
||||
# Run unit tests.
|
||||
cd build
|
||||
ctest -R memgraph__unit --output-on-failure
|
||||
|
||||
# - name: Run e2e tests
|
||||
# run: |
|
||||
# cd tests
|
||||
# ./setup.sh /opt/toolchain-v4/activate
|
||||
# source ve3/bin/activate_e2e
|
||||
# cd e2e
|
||||
# ./run.sh
|
||||
- name: Run e2e tests
|
||||
run: |
|
||||
cd tests
|
||||
./setup.sh /opt/toolchain-v4/activate
|
||||
source ve3/bin/activate_e2e
|
||||
cd e2e
|
||||
./run.sh
|
||||
|
||||
# - name: Run stress test (plain)
|
||||
# run: |
|
||||
# cd tests/stress
|
||||
# ./continuous_integration
|
||||
- name: Run stress test (plain)
|
||||
run: |
|
||||
cd tests/stress
|
||||
./continuous_integration
|
||||
|
||||
# - name: Run stress test (SSL)
|
||||
# run: |
|
||||
# cd tests/stress
|
||||
# ./continuous_integration --use-ssl
|
||||
- name: Run stress test (SSL)
|
||||
run: |
|
||||
cd tests/stress
|
||||
./continuous_integration --use-ssl
|
||||
|
||||
- name: Run stress test (large)
|
||||
run: |
|
||||
|
||||
@@ -36,7 +36,7 @@ ADDITIONAL USE GRANT: You may use the Licensed Work in accordance with the
|
||||
3. using the Licensed Work to create a work or solution
|
||||
which competes (or might reasonably be expected to
|
||||
compete) with the Licensed Work.
|
||||
CHANGE DATE: 2027-30-10
|
||||
CHANGE DATE: 2027-08-12
|
||||
CHANGE LICENSE: Apache License, Version 2.0
|
||||
|
||||
For information about alternative licensing arrangements, please visit: https://memgraph.com/legal.
|
||||
|
||||
@@ -1276,28 +1276,59 @@ antlrcpp::Any CypherMainVisitor::visitCallProcedure(MemgraphCypher::CallProcedur
|
||||
call_proc->result_identifiers_.push_back(storage_->Create<Identifier>(result_alias));
|
||||
}
|
||||
} else {
|
||||
const auto &maybe_found =
|
||||
procedure::FindProcedure(procedure::gModuleRegistry, call_proc->procedure_name_, utils::NewDeleteResource());
|
||||
if (!maybe_found) {
|
||||
throw SemanticException("There is no procedure named '{}'.", call_proc->procedure_name_);
|
||||
call_proc->is_write_ = maybe_found->second->info.is_write;
|
||||
|
||||
auto *yield_ctx = ctx->yieldProcedureResults();
|
||||
if (!yield_ctx) {
|
||||
if (!maybe_found->second->results.empty() && !call_proc->void_procedure_) {
|
||||
throw SemanticException(
|
||||
"CALL without YIELD may only be used on procedures which do not "
|
||||
"return any result fields.");
|
||||
}
|
||||
// When we return, we will release the lock on modules. This means that
|
||||
// someone may reload the procedure and change the result signature. But to
|
||||
// keep the implementation simple, we ignore the case as the rest of the
|
||||
// code doesn't really care whether we yield or not, so it should not break.
|
||||
return call_proc;
|
||||
}
|
||||
const auto &[module, proc] = *maybe_found;
|
||||
call_proc->result_fields_.reserve(proc->results.size());
|
||||
call_proc->result_identifiers_.reserve(proc->results.size());
|
||||
for (const auto &[result_name, desc] : proc->results) {
|
||||
bool is_deprecated = desc.second;
|
||||
if (is_deprecated) continue;
|
||||
call_proc->result_fields_.emplace_back(result_name);
|
||||
call_proc->result_identifiers_.push_back(storage_->Create<Identifier>(std::string(result_name)));
|
||||
if (yield_ctx->getTokens(MemgraphCypher::ASTERISK).empty()) {
|
||||
call_proc->result_fields_.reserve(yield_ctx->procedureResult().size());
|
||||
call_proc->result_identifiers_.reserve(yield_ctx->procedureResult().size());
|
||||
for (auto *result : yield_ctx->procedureResult()) {
|
||||
MG_ASSERT(result->variable().size() == 1 || result->variable().size() == 2);
|
||||
call_proc->result_fields_.push_back(std::any_cast<std::string>(result->variable()[0]->accept(this)));
|
||||
std::string result_alias;
|
||||
if (result->variable().size() == 2) {
|
||||
result_alias = std::any_cast<std::string>(result->variable()[1]->accept(this));
|
||||
} else {
|
||||
result_alias = std::any_cast<std::string>(result->variable()[0]->accept(this));
|
||||
}
|
||||
call_proc->result_identifiers_.push_back(storage_->Create<Identifier>(result_alias));
|
||||
}
|
||||
} else {
|
||||
const auto &maybe_found =
|
||||
procedure::FindProcedure(procedure::gModuleRegistry, call_proc->procedure_name_, utils::NewDeleteResource());
|
||||
if (!maybe_found) {
|
||||
throw SemanticException("There is no procedure named '{}'.", call_proc->procedure_name_);
|
||||
}
|
||||
const auto &[module, proc] = *maybe_found;
|
||||
call_proc->result_fields_.reserve(proc->results.size());
|
||||
call_proc->result_identifiers_.reserve(proc->results.size());
|
||||
for (const auto &[result_name, desc] : proc->results) {
|
||||
bool is_deprecated = desc.second;
|
||||
if (is_deprecated) continue;
|
||||
call_proc->result_fields_.emplace_back(result_name);
|
||||
call_proc->result_identifiers_.push_back(storage_->Create<Identifier>(std::string(result_name)));
|
||||
}
|
||||
// When we leave the scope, we will release the lock on modules. This means
|
||||
// that someone may reload the procedure and change its result signature. We
|
||||
// are fine with this, because if new result fields were added then we yield
|
||||
// the subset of those and that will appear to a user as if they used the
|
||||
// procedure before reload. Any subsequent `CALL ... YIELD *` will fetch the
|
||||
// new fields as well. In case the result signature has had some result
|
||||
// fields removed, then the query execution will report an error that we are
|
||||
// yielding missing fields. The user can then just retry the query.
|
||||
}
|
||||
// When we leave the scope, we will release the lock on modules. This means
|
||||
// that someone may reload the procedure and change its result signature. We
|
||||
// are fine with this, because if new result fields were added then we yield
|
||||
// the subset of those and that will appear to a user as if they used the
|
||||
// procedure before reload. Any subsequent `CALL ... YIELD *` will fetch the
|
||||
// new fields as well. In case the result signature has had some result
|
||||
// fields removed, then the query execution will report an error that we are
|
||||
// yielding missing fields. The user can then just retry the query.
|
||||
}
|
||||
|
||||
return call_proc;
|
||||
|
||||
@@ -212,6 +212,7 @@ def run_stress_test_suite(args: Args) -> Optional[Dict[str, float]]:
|
||||
print(f"Failed to execute {test_run} with following exception:", ex)
|
||||
err = True
|
||||
finally:
|
||||
stop_memgraph(memgraph_proc)
|
||||
cleanup(memgraph_proc)
|
||||
if err:
|
||||
return None
|
||||
|
||||
@@ -260,10 +260,11 @@ def run_monitor_cleanup(repetition_count: int, sleep_sec: float) -> None:
|
||||
# Problem with test using detach delete and memory tracker
|
||||
# is that memory tracker gets updated immediately
|
||||
# whereas RES takes some time
|
||||
cnt_again = 3
|
||||
# Tries 10 times or fails
|
||||
cnt_again = 10
|
||||
skip_failure = False
|
||||
# 10% is maximum increment, afterwards is fail
|
||||
multiplier = 1
|
||||
# 10% is maximum diff for this test to pass
|
||||
multiplier = 1.10
|
||||
while cnt_again:
|
||||
new_memory_tracker, new_res_data = get_storage_data(session)
|
||||
|
||||
@@ -277,7 +278,6 @@ def run_monitor_cleanup(repetition_count: int, sleep_sec: float) -> None:
|
||||
f"RES data: {new_res_data}, multiplier: {multiplier}"
|
||||
)
|
||||
break
|
||||
multiplier += 0.05
|
||||
cnt_again -= 1
|
||||
if not skip_failure:
|
||||
log.info(memory_tracker, initial_diff, res_data)
|
||||
|
||||
@@ -135,25 +135,6 @@ SMALL_DATASET = [
|
||||
# long_running runs for 8h
|
||||
LARGE_DATASET = (
|
||||
[
|
||||
{
|
||||
DatasetConstants.TEST: "long_running.cpp",
|
||||
DatasetConstants.OPTIONS: [
|
||||
"--vertex-count",
|
||||
"200000",
|
||||
"--edge-count",
|
||||
"1000000",
|
||||
"--max-time",
|
||||
"480",
|
||||
"--verify",
|
||||
"300",
|
||||
"--stats-file",
|
||||
STATS_FILE,
|
||||
],
|
||||
DatasetConstants.TIMEOUT: 500,
|
||||
DatasetConstants.MODE: [get_default_database_mode()],
|
||||
},
|
||||
]
|
||||
+ [
|
||||
{
|
||||
DatasetConstants.TEST: "bipartite.py",
|
||||
DatasetConstants.OPTIONS: ["--u-count", "300", "--v-count", "300"],
|
||||
@@ -191,4 +172,23 @@ LARGE_DATASET = (
|
||||
},
|
||||
]
|
||||
* 6
|
||||
+ [
|
||||
{
|
||||
DatasetConstants.TEST: "long_running.cpp",
|
||||
DatasetConstants.OPTIONS: [
|
||||
"--vertex-count",
|
||||
"200000",
|
||||
"--edge-count",
|
||||
"1000000",
|
||||
"--max-time",
|
||||
"480",
|
||||
"--verify",
|
||||
"300",
|
||||
"--stats-file",
|
||||
STATS_FILE,
|
||||
],
|
||||
DatasetConstants.TIMEOUT: 500,
|
||||
DatasetConstants.MODE: [get_default_database_mode()],
|
||||
},
|
||||
]
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user