fix: gpstore query prefixes, file paths, and README clarifications (#55)

SoftlySpoken · web-flow · commit 5a4f9d7b7bc5 · 2025-09-23T20:20:45.000+08:00
* doc: Clarify validation and build &amp; load database steps in gpstore README

* fix: fix parameters_dir &amp; updates_dir in gpstore properties files

* fix: add plugin prefix to gpstore queries to adapt to docker

* fix: upload correct validation_params.csv for gpstore
diff --git a/gpstore/README.md b/gpstore/README.md
@@ -106,17 +106,24 @@ exit
 docker restart gpstore-server
 ```
 
-## 2.3 Load data
+## 2.3 Build & load database
 
 ```bash
+# Build database
 curl -X POST -H 'Content-Type: application/json' -d '{"operation":"build","username":"root","password":"123456","db_name":"finbench-sf10"}' http://127.0.0.1:9009/grpc/api
+# Load database
 curl -X POST -H 'Content-Type: application/json' -d '{"operation":"load","username":"root","password":"123456","db_name":"finbench-sf10"}' http://127.0.0.1:9009/grpc/api
 ```
 
 # 3. Benchmark
 
 ## 3.1 Validate
 
+Please note that, typically, *either 3.1.1 or 3.1.2 will be executed across a run*, since they serve different purposes:
+
+- "Create validation" is for generating a `validation_params.csv` file from gpstore's outputs, so as this CSV file can be used as the ground truth to validate other systems.
+- "Validate" is for validating gpstore against an existing, correct `validation_params.csv` file, such as that provided under this directory.
+
 ### 3.1.1 Create validation
 
 ```shell
diff --git a/gpstore/benchmark.properties b/gpstore/benchmark.properties
@@ -29,8 +29,8 @@ validation_parameters_size=100
 validate_workload=true
 validate_database=validation_params.csv
 warmup=450000
-ldbc.finbench.transaction.queries.parameters_dir=data/sf10/read_params
-ldbc.finbench.transaction.queries.updates_dir=data/sf10/incremental
+ldbc.finbench.transaction.queries.parameters_dir=data/finbench-sf10/read_params
+ldbc.finbench.transaction.queries.updates_dir=data/finbench-sf10/incremental
 # param and update files suffix, `csv` or `parquet`, default is `csv`
 ldbc.finbench.transaction.queries.files_suffix=csv
 ldbc.finbench.transaction.queries.simple_read_dissipation=0.2
diff --git a/gpstore/create_validation.properties b/gpstore/create_validation.properties
@@ -29,8 +29,8 @@ validation_parameters_size=10000
 validate_workload=true
 validate_database=validation_params.csv
 warmup=0
-ldbc.finbench.transaction.queries.parameters_dir=data/sf10/read_params
-ldbc.finbench.transaction.queries.updates_dir=data/sf10/incremental
+ldbc.finbench.transaction.queries.parameters_dir=data/finbench-sf10/read_params
+ldbc.finbench.transaction.queries.updates_dir=data/finbench-sf10/incremental
 # param and update files suffix, `csv` or `parquet`, default is `csv`
 ldbc.finbench.transaction.queries.files_suffix=csv
 ldbc.finbench.transaction.queries.simple_read_dissipation=0.2
diff --git a/gpstore/queries/transaction-complex-read-1.cypher b/gpstore/queries/transaction-complex-read-1.cypher
@@ -1,3 +1,3 @@
-CALL tcr1($id, $startTime, $endTime, $truncationLimit, $truncationOrder)
+CALL plugin.tcr1($id, $startTime, $endTime, $truncationLimit, $truncationOrder)
 YIELD otherId, accountDistance, mediumId, mediumType
 RETURN otherId, accountDistance, mediumId, mediumType
diff --git a/gpstore/queries/transaction-complex-read-10.cypher b/gpstore/queries/transaction-complex-read-10.cypher
@@ -1,3 +1,3 @@
-CALL tcr10($pid1, $pid2, $startTime, $endTime)
+CALL plugin.tcr10($pid1, $pid2, $startTime, $endTime)
 YIELD jaccardSimilarity
 RETURN jaccardSimilarity
diff --git a/gpstore/queries/transaction-complex-read-11.cypher b/gpstore/queries/transaction-complex-read-11.cypher
@@ -1,3 +1,3 @@
-CALL tcr11($id, $startTime, $endTime, $truncationLimit, $truncationOrder)
+CALL plugin.tcr11($id, $startTime, $endTime, $truncationLimit, $truncationOrder)
 YIELD sumLoanAmount, numLoans
 RETURN sumLoanAmount, numLoans
diff --git a/gpstore/queries/transaction-complex-read-12.cypher b/gpstore/queries/transaction-complex-read-12.cypher
@@ -1,3 +1,3 @@
-CALL tcr12($id, $startTime, $endTime, $truncationLimit, $truncationOrder)
+CALL plugin.tcr12($id, $startTime, $endTime, $truncationLimit, $truncationOrder)
 YIELD compAccountId, sumEdge2Amount
 RETURN compAccountId, sumEdge2Amount
diff --git a/gpstore/queries/transaction-complex-read-2.cypher b/gpstore/queries/transaction-complex-read-2.cypher
@@ -1,3 +1,3 @@
-CALL tcr2($id, $startTime, $endTime, $truncationLimit, $truncationOrder)
+CALL plugin.tcr2($id, $startTime, $endTime, $truncationLimit, $truncationOrder)
 YIELD otherId, sumLoanAmount, sumLoanBalance
 RETURN otherId, sumLoanAmount, sumLoanBalance
diff --git a/gpstore/queries/transaction-complex-read-3.cypher b/gpstore/queries/transaction-complex-read-3.cypher
@@ -1,3 +1,3 @@
-CALL tcr3($id1, $id2, $startTime, $endTime)
+CALL plugin.tcr3($id1, $id2, $startTime, $endTime)
 YIELD shortestPathLength
 RETURN shortestPathLength
diff --git a/gpstore/queries/transaction-complex-read-4.cypher b/gpstore/queries/transaction-complex-read-4.cypher
@@ -1,3 +1,3 @@
-CALL tcr4($id1, $id2, $startTime, $endTime)
+CALL plugin.tcr4($id1, $id2, $startTime, $endTime)
 YIELD otherId, numEdge2, sumEdge2Amount, maxEdge2Amount, numEdge3, sumEdge3Amount, maxEdge3Amount
 RETURN otherId, numEdge2, sumEdge2Amount, maxEdge2Amount, numEdge3, sumEdge3Amount, maxEdge3Amount
diff --git a/gpstore/queries/transaction-complex-read-5.cypher b/gpstore/queries/transaction-complex-read-5.cypher
@@ -1,3 +1,3 @@
-CALL tcr5($id, $startTime, $endTime, $truncationLimit, $truncationOrder)
+CALL plugin.tcr5($id, $startTime, $endTime, $truncationLimit, $truncationOrder)
 YIELD path
 RETURN path
diff --git a/gpstore/queries/transaction-complex-read-6.cypher b/gpstore/queries/transaction-complex-read-6.cypher
@@ -1,3 +1,3 @@
-CALL tcr6($id, $threshold1, $threshold2, $startTime, $endTime, $truncationLimit, $truncationOrder)
+CALL plugin.tcr6($id, $threshold1, $threshold2, $startTime, $endTime, $truncationLimit, $truncationOrder)
 YIELD midId, sumEdge1Amount, sumEdge2Amount
 RETURN midId, sumEdge1Amount, sumEdge2Amount
diff --git a/gpstore/queries/transaction-complex-read-7.cypher b/gpstore/queries/transaction-complex-read-7.cypher
@@ -1,3 +1,3 @@
-CALL tcr7($id, $threshold, $startTime, $endTime, $truncationLimit, $truncationOrder)
+CALL plugin.tcr7($id, $threshold, $startTime, $endTime, $truncationLimit, $truncationOrder)
 YIELD numSrc, numDst, inOutRatio
 RETURN numSrc, numDst, inOutRatio
diff --git a/gpstore/queries/transaction-complex-read-8.cypher b/gpstore/queries/transaction-complex-read-8.cypher
@@ -1,3 +1,3 @@
-CALL tcr8($id, $threshold, $startTime, $endTime, $truncationLimit, $truncationOrder)
+CALL plugin.tcr8($id, $threshold, $startTime, $endTime, $truncationLimit, $truncationOrder)
 YIELD dstId, ratio, minDistanceFromLoan
 RETURN dstId, ratio, minDistanceFromLoan
diff --git a/gpstore/queries/transaction-complex-read-9.cypher b/gpstore/queries/transaction-complex-read-9.cypher
@@ -1,3 +1,3 @@
-CALL tcr9($id, $threshold, $startTime, $endTime, $truncationLimit, $truncationOrder)
+CALL plugin.tcr9($id, $threshold, $startTime, $endTime, $truncationLimit, $truncationOrder)
 YIELD ratioRepay, ratioDeposit, ratioTransfer
 RETURN ratioRepay, ratioDeposit, ratioTransfer
diff --git a/gpstore/queries/transaction-read-write-1.cypher b/gpstore/queries/transaction-read-write-1.cypher
@@ -1 +1 @@
-CALL trw1($srcId, $dstId, $time, $amount, $startTime, $endTime)
+CALL plugin.trw1($srcId, $dstId, $time, $amount, $startTime, $endTime)
diff --git a/gpstore/queries/transaction-read-write-2.cypher b/gpstore/queries/transaction-read-write-2.cypher
@@ -1 +1 @@
-CALL trw2($srcId, $dstId, $time, $amount, $amountThreshold, $startTime, $endTime, $ratioThreshold, $truncationLimit, $truncationOrder)
+CALL plugin.trw2($srcId, $dstId, $time, $amount, $amountThreshold, $startTime, $endTime, $ratioThreshold, $truncationLimit, $truncationOrder)
diff --git a/gpstore/queries/transaction-read-write-3.cypher b/gpstore/queries/transaction-read-write-3.cypher
@@ -1 +1 @@
-CALL trw3($srcId, $dstId, $time, $threshold, $startTime, $endTime, $truncationLimit, $truncationOrder)
+CALL plugin.trw3($srcId, $dstId, $time, $threshold, $startTime, $endTime, $truncationLimit, $truncationOrder)
diff --git a/gpstore/queries/transaction-simple-read-1.cypher b/gpstore/queries/transaction-simple-read-1.cypher
@@ -1,3 +1,3 @@
-CALL tsr1($id)
+CALL plugin.tsr1($id)
 YIELD createTime, isBlocked, type
 RETURN createTime, isBlocked, type
diff --git a/gpstore/queries/transaction-simple-read-2.cypher b/gpstore/queries/transaction-simple-read-2.cypher
@@ -1,3 +1,3 @@
-CALL tsr2($id, $startTime, $endTime)
+CALL plugin.tsr2($id, $startTime, $endTime)
 YIELD sumEdge1Amount, maxEdge1Amount, numEdge1, sumEdge2Amount, maxEdge2Amount, numEdge2
 RETURN sumEdge1Amount, maxEdge1Amount, numEdge1, sumEdge2Amount, maxEdge2Amount, numEdge2
diff --git a/gpstore/queries/transaction-simple-read-3.cypher b/gpstore/queries/transaction-simple-read-3.cypher
@@ -1,3 +1,3 @@
-CALL tsr3($id, $threshold, $startTime, $endTime)
+CALL plugin.tsr3($id, $threshold, $startTime, $endTime)
 YIELD blockRatio
 RETURN blockRatio
diff --git a/gpstore/queries/transaction-simple-read-4.cypher b/gpstore/queries/transaction-simple-read-4.cypher
@@ -1,3 +1,3 @@
-CALL tsr4($id, $threshold, $startTime, $endTime)
+CALL plugin.tsr4($id, $threshold, $startTime, $endTime)
 YIELD dstId, numEdges, sumAmount
 RETURN dstId, numEdges, sumAmount
diff --git a/gpstore/queries/transaction-simple-read-5.cypher b/gpstore/queries/transaction-simple-read-5.cypher
@@ -1,3 +1,3 @@
-CALL tsr5($id, $threshold, $startTime, $endTime)
+CALL plugin.tsr5($id, $threshold, $startTime, $endTime)
 YIELD srcId, numEdges, sumAmount
 RETURN srcId, numEdges, sumAmount
diff --git a/gpstore/queries/transaction-simple-read-6.cypher b/gpstore/queries/transaction-simple-read-6.cypher
@@ -1,3 +1,3 @@
-CALL tsr6($id, $startTime, $endTime)
+CALL plugin.tsr6($id, $startTime, $endTime)
 YIELD dstId
 RETURN dstId
diff --git a/gpstore/queries/transaction-write-1.cypher b/gpstore/queries/transaction-write-1.cypher
@@ -1 +1 @@
-CALL tw1($personId, $personName, $isBlocked)
+CALL plugin.tw1($personId, $personName, $isBlocked)
diff --git a/gpstore/queries/transaction-write-10.cypher b/gpstore/queries/transaction-write-10.cypher
@@ -1 +1 @@
-CALL tw10($personId1, $personId2, $time)
+CALL plugin.tw10($personId1, $personId2, $time)
diff --git a/gpstore/queries/transaction-write-11.cypher b/gpstore/queries/transaction-write-11.cypher
@@ -1 +1 @@
-CALL tw11($companyId1, $companyId2, $time)
+CALL plugin.tw11($companyId1, $companyId2, $time)
diff --git a/gpstore/queries/transaction-write-12.cypher b/gpstore/queries/transaction-write-12.cypher
@@ -1 +1 @@
-CALL tw12($accountId1, $accountId2, $time, $amount)
+CALL plugin.tw12($accountId1, $accountId2, $time, $amount)
diff --git a/gpstore/queries/transaction-write-13.cypher b/gpstore/queries/transaction-write-13.cypher
@@ -1 +1 @@
-CALL tw13($accountId1, $accountId2, $time, $amount)
+CALL plugin.tw13($accountId1, $accountId2, $time, $amount)
diff --git a/gpstore/queries/transaction-write-14.cypher b/gpstore/queries/transaction-write-14.cypher
@@ -1 +1 @@
-CALL tw14($accountId, $loanId, $time, $amount)
+CALL plugin.tw14($accountId, $loanId, $time, $amount)
diff --git a/gpstore/queries/transaction-write-15.cypher b/gpstore/queries/transaction-write-15.cypher
@@ -1 +1 @@
-CALL tw15($loanId, $accountId, $time, $amount)
+CALL plugin.tw15($loanId, $accountId, $time, $amount)
diff --git a/gpstore/queries/transaction-write-16.cypher b/gpstore/queries/transaction-write-16.cypher
@@ -1 +1 @@
-CALL tw16($mediumId, $accountId, $time)
+CALL plugin.tw16($mediumId, $accountId, $time)
diff --git a/gpstore/queries/transaction-write-17.cypher b/gpstore/queries/transaction-write-17.cypher
@@ -1 +1 @@
-CALL tw17($accountId)
+CALL plugin.tw17($accountId)
diff --git a/gpstore/queries/transaction-write-18.cypher b/gpstore/queries/transaction-write-18.cypher
@@ -1 +1 @@
-CALL tw18($accountId)
+CALL plugin.tw18($accountId)
diff --git a/gpstore/queries/transaction-write-19.cypher b/gpstore/queries/transaction-write-19.cypher
@@ -1 +1 @@
-CALL tw19($personId)
+CALL plugin.tw19($personId)
diff --git a/gpstore/queries/transaction-write-2.cypher b/gpstore/queries/transaction-write-2.cypher
@@ -1 +1 @@
-CALL tw2($companyId, $companyName, $isBlocked)
+CALL plugin.tw2($companyId, $companyName, $isBlocked)
diff --git a/gpstore/queries/transaction-write-3.cypher b/gpstore/queries/transaction-write-3.cypher
@@ -1 +1 @@
-CALL tw3($mediumId, $mediumType, $isBlocked)
+CALL plugin.tw3($mediumId, $mediumType, $isBlocked)
diff --git a/gpstore/queries/transaction-write-4.cypher b/gpstore/queries/transaction-write-4.cypher
@@ -1 +1 @@
-CALL tw4($personId, $accountId, $time, $accountBlocked, $accountType)
+CALL plugin.tw4($personId, $accountId, $time, $accountBlocked, $accountType)
diff --git a/gpstore/queries/transaction-write-5.cypher b/gpstore/queries/transaction-write-5.cypher
@@ -1 +1 @@
-CALL tw5($companyId, $accountId, $time, $accountBlocked, $accountType)
+CALL plugin.tw5($companyId, $accountId, $time, $accountBlocked, $accountType)
diff --git a/gpstore/queries/transaction-write-6.cypher b/gpstore/queries/transaction-write-6.cypher
@@ -1 +1 @@
-CALL tw6($personId, $loanId, $loanAmount, $balance, $time)
+CALL plugin.tw6($personId, $loanId, $loanAmount, $balance, $time)
diff --git a/gpstore/queries/transaction-write-7.cypher b/gpstore/queries/transaction-write-7.cypher
@@ -1 +1 @@
-CALL tw7($companyId, $loanId, $loanAmount, $balance, $time)
+CALL plugin.tw7($companyId, $loanId, $loanAmount, $balance, $time)
diff --git a/gpstore/queries/transaction-write-8.cypher b/gpstore/queries/transaction-write-8.cypher
@@ -1 +1 @@
-CALL tw8($personId, $companyId, $time, $ratio)
+CALL plugin.tw8($personId, $companyId, $time, $ratio)
diff --git a/gpstore/queries/transaction-write-9.cypher b/gpstore/queries/transaction-write-9.cypher
@@ -1 +1 @@
-CALL tw9($companyId1, $companyId2, $time, $ratio)
+CALL plugin.tw9($companyId1, $companyId2, $time, $ratio)
diff --git a/gpstore/validate_database.properties b/gpstore/validate_database.properties
@@ -29,8 +29,8 @@ validation_parameters_size=10000
 validate_workload=true
 validate_database=validation_params.csv
 warmup=0
-ldbc.finbench.transaction.queries.parameters_dir=data/sf10/read_params
-ldbc.finbench.transaction.queries.updates_dir=data/sf10/incremental
+ldbc.finbench.transaction.queries.parameters_dir=data/finbench-sf10/read_params
+ldbc.finbench.transaction.queries.updates_dir=data/finbench-sf10/incremental
 # param and update files suffix, `csv` or `parquet`, default is `csv`
 ldbc.finbench.transaction.queries.files_suffix=csv
 ldbc.finbench.transaction.queries.simple_read_dissipation=0.2
diff --git a/gpstore/validation_params.csv b/gpstore/validation_params.csv
