@@ -548,13 +548,9 @@ def verify_single_thread_series(
548548 verify_dir = db_path
549549 verify_dir .mkdir (parents = True , exist_ok = True )
550550 dataset_tag = args .dataset .replace ("-" , "_" )
551- arcadedb_oltp_language = (
552- args .arcadedb_oltp_language if db_label == "arcadedb" else None
553- )
554- language_suffix = f"_{ arcadedb_oltp_language } " if arcadedb_oltp_language else ""
555551 baseline_path = (
556552 verify_dir
557- / f"verify_09_graph_oltp_{ db_label } { language_suffix } _{ dataset_tag } _tx{ args .transactions } _seed{ args .seed } .json"
553+ / f"verify_09_graph_oltp_{ db_label } _{ dataset_tag } _tx{ args .transactions } _seed{ args .seed } .json"
558554 )
559555
560556 current_payload = {
@@ -563,7 +559,6 @@ def verify_single_thread_series(
563559 "transactions" : int (args .transactions ),
564560 "seed" : int (args .seed ),
565561 "threads" : int (args .threads ),
566- "arcadedb_oltp_language" : arcadedb_oltp_language ,
567562 "node_count" : int (summary .get ("node_count" ) or 0 ),
568563 "edge_count" : int (summary .get ("edge_count" ) or 0 ),
569564 "node_counts_by_type" : normalize_count_dict (summary .get ("node_counts_by_type" )),
@@ -578,7 +573,6 @@ def write_baseline() -> None:
578573 "%Y-%m-%dT%H:%M:%SZ"
579574 ),
580575 "source_db" : db_label ,
581- "source_oltp_language" : arcadedb_oltp_language ,
582576 },
583577 "baseline" : current_payload ,
584578 }
@@ -2435,7 +2429,7 @@ def run_graph_oltp_arcadedb(
24352429 next_answer_id = load_info ["max_ids" ]["answer" ] + 1
24362430 next_badge_id = load_info ["max_ids" ]["badge" ] + 1
24372431 next_comment_id = load_info ["max_ids" ]["comment" ] + 1
2438- arcadedb_oltp_language = (oltp_language or "cypher" ).strip ().lower ()
2432+ arcadedb_mode = (oltp_language or "cypher" ).strip ().lower ()
24392433
24402434 def worker (ops : List [str ], worker_id : int ) -> Dict [str , List [float ]]:
24412435 rng = random .Random (seed + worker_id )
@@ -2449,7 +2443,7 @@ def worker(ops: List[str], worker_id: int) -> Dict[str, List[float]]:
24492443 for op in ops :
24502444 start_time = time .perf_counter ()
24512445
2452- if arcadedb_oltp_language == "sql" :
2446+ if arcadedb_mode == "sql" :
24532447 try :
24542448 if op == "read" :
24552449 read_kind = rng .choice (READ_TARGET_KINDS )
@@ -3640,7 +3634,6 @@ def do_delete():
36403634 "edge_count" : edge_count ,
36413635 "node_counts_by_type" : node_counts_by_type ,
36423636 "edge_counts_by_type" : edge_counts_by_type ,
3643- "arcadedb_oltp_language" : arcadedb_oltp_language ,
36443637 }
36453638
36463639
@@ -7673,10 +7666,6 @@ def write_results(db_path: Path, args: argparse.Namespace, summary: dict):
76737666 "query_result_hash_stable" : summary .get ("query_result_hash_stable" ),
76747667 "query_row_count_stable" : summary .get ("query_row_count_stable" ),
76757668 "benchmark_scope_note" : summary .get ("benchmark_scope_note" ),
7676- "arcadedb_oltp_language" : summary .get (
7677- "arcadedb_oltp_language" ,
7678- args .arcadedb_oltp_language if args .db == "arcadedb" else None ,
7679- ),
76807669 }
76817670 results_path .parent .mkdir (parents = True , exist_ok = True )
76827671 with open (results_path , "w" , encoding = "utf-8" ) as handle :
@@ -7757,7 +7746,7 @@ def run_in_docker(args) -> bool:
77577746 filtered_args .append (arg )
77587747
77597748 arcadedb_wheel_mount_path = None
7760- if args .db == "arcadedb" :
7749+ if args .db . startswith ( "arcadedb_" ) :
77617750 wheel_candidates = sorted (
77627751 (repo_root / "bindings/python/dist" ).glob ("*embed*.whl" )
77637752 )
@@ -7845,15 +7834,16 @@ def main():
78457834 parser .add_argument (
78467835 "--db" ,
78477836 choices = [
7848- "arcadedb" ,
7837+ "arcadedb_sql" ,
7838+ "arcadedb_cypher" ,
78497839 "ladybug" ,
78507840 "ladybugdb" ,
78517841 "graphqlite" ,
78527842 "sqlite_native" ,
78537843 "python_memory" ,
78547844 ],
7855- default = "arcadedb " ,
7856- help = "Database to test (default: arcadedb )" ,
7845+ default = "arcadedb_cypher " ,
7846+ help = "Database to test (default: arcadedb_cypher )" ,
78577847 )
78587848 parser .add_argument (
78597849 "--threads" ,
@@ -7908,12 +7898,6 @@ def main():
79087898 action = "store_true" ,
79097899 help = "For threads=1 only, assert final graph counts match deterministic single-thread baseline" ,
79107900 )
7911- parser .add_argument (
7912- "--arcadedb-oltp-language" ,
7913- choices = ["cypher" , "sql" ],
7914- default = "cypher" ,
7915- help = "ArcadeDB OLTP CRUD language (default: cypher)" ,
7916- )
79177901 parser .add_argument (
79187902 "--sqlite-profile" ,
79197903 choices = SQLITE_PROFILE_CHOICES ,
@@ -7928,8 +7912,6 @@ def main():
79287912 parser .error ("--jvm-heap-fraction must be > 0 and <= 1" )
79297913 if args .verify_single_thread_series and args .threads != 1 :
79307914 parser .error ("--verify-single-thread-series requires --threads 1" )
7931- if args .db not in ("arcadedb" ,) and args .arcadedb_oltp_language != "cypher" :
7932- parser .error ("--arcadedb-oltp-language is only applicable when --db arcadedb" )
79337915
79347916 ran = run_in_docker (args )
79357917 if ran :
@@ -7940,7 +7922,7 @@ def main():
79407922 args .mem_limit ,
79417923 args .jvm_heap_fraction ,
79427924 )
7943- if args .db == "arcadedb"
7925+ if args .db . startswith ( "arcadedb_" )
79447926 else args .mem_limit
79457927 )
79467928 args .heap_size_effective = heap_size
@@ -7967,14 +7949,14 @@ def main():
79677949 print (f"Threads: { args .threads } " )
79687950 print (f"Operations: { args .transactions :,} " )
79697951 print (f"Batch size: { args .batch_size } " )
7970- if args .db == "arcadedb" :
7952+ if args .db . startswith ( "arcadedb_" ) :
79717953 print (f"JVM heap size: { heap_size } " )
7972- print (f"ArcadeDB OLTP language: { args .arcadedb_oltp_language } " )
7954+ print (f"ArcadeDB OLTP language: { args .db . removeprefix ( 'arcadedb_' ) } " )
79737955 print (f"DB path: { db_path } " )
79747956 print (BENCHMARK_SCOPE_NOTE )
79757957 print ()
79767958
7977- if args .db == "arcadedb" :
7959+ if args .db . startswith ( "arcadedb_" ) :
79787960 summary = run_graph_oltp_arcadedb (
79797961 db_path = db_path ,
79807962 data_dir = data_dir ,
@@ -7983,7 +7965,7 @@ def main():
79837965 threads = args .threads ,
79847966 seed = args .seed ,
79857967 jvm_kwargs = jvm_kwargs ,
7986- oltp_language = args .arcadedb_oltp_language ,
7968+ oltp_language = args .db . removeprefix ( "arcadedb_" ) ,
79877969 )
79887970 elif args .db in ("ladybug" , "ladybugdb" ):
79897971 summary = run_graph_oltp_ladybug (
0 commit comments