Skip to content

Consolidate eval scripts #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yl-2010 merged 3 commits into from
Aug 24, 2026
Merged

Consolidate eval scripts #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7e6796
Consolidated scripts to one directory and fixed paper-related scripts
yl-2010 Aug 17, 2026
d0a3107
Merge origin/main into consolidate-eval-scripts
yl-2010 Aug 22, 2026
16dd7ac
new EvalUtil class for printing query time in tests
yl-2010 Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions estore/src/test/java/org/estore/DbMetadataTest/H2MetadataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@
public class H2MetadataTest {
private Connection h2Conn1;
private Estore estore1;
private boolean profileFlag;

@BeforeEach
public void setup() throws Exception {
String profileOpt = System.getProperty("profile");
Boolean profileFlag = (profileOpt != null) && (profileOpt.equals("true"));
profileFlag = (profileOpt != null) && (profileOpt.equals("true"));

estore1 =
new Estore(
Expand Down Expand Up @@ -108,7 +109,9 @@ public void testCatalogsJDBCRepeat() throws Exception {
long t1 = System.nanoTime();
DatabaseMetaData meta1 = h2Conn1.getMetaData();
res1 = meta1.getCatalogs();
// System.out.println("Total Query Time : " + (System.nanoTime() - t1));
if (profileFlag) {
System.out.println("Total Query Time : " + (System.nanoTime() - t1));
}
}

Set<String> catalogs = new HashSet<>();
Expand Down Expand Up @@ -201,7 +204,9 @@ public void testSchemasJDBCRepeat() throws Exception {
long t1 = System.nanoTime();
DatabaseMetaData meta1 = h2Conn1.getMetaData();
res1 = meta1.getSchemas();
// System.out.println("Total Query Time : " + (System.nanoTime() - t1));
if (profileFlag) {
System.out.println("Total Query Time : " + (System.nanoTime() - t1));
}
}

Set<String> schemas = new HashSet<>();
Expand Down Expand Up @@ -317,7 +322,9 @@ public void testTablesJDBCRepeat() throws Exception {
long t1 = System.nanoTime();
DatabaseMetaData meta1 = h2Conn1.getMetaData();
res1 = meta1.getTables(null, "PUBLIC", "%", new String[] {"TABLE"});
// System.out.println("Total Query Time : " + (System.nanoTime() - t1));
if (profileFlag) {
System.out.println("Total Query Time : " + (System.nanoTime() - t1));
}
}

Set<String> tables = new HashSet<>();
Expand Down
14 changes: 14 additions & 0 deletions estore/src/test/java/org/estore/eval/EvalUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package org.estore.eval;

public final class EvalUtil {
private EvalUtil() {}

public static void printQueryTime(String queryName, long startNanos) {
String profileOpt = System.getProperty("profile");
if (profileOpt != null && profileOpt.equals("true")) {
System.out.println(queryName);
System.out.println(
"Time: " + ((float) (System.nanoTime() - startNanos)) / 1_000_000.0 + "ms");
}
}
}
25 changes: 9 additions & 16 deletions estore/src/test/java/org/estore/eval/ldbc/finbench/Fin001Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.estore.Estore;
import org.estore.EstoreOptions;
import org.estore.compiler.CompileQuery;
import org.estore.eval.EvalUtil;
import org.estore.eval.ldbc.finbench.util.*;
import org.estore.planner.util.Table;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -33,108 +34,100 @@ public void setupData() throws Exception {
@CompileQuery
@Test
public void testTw1() {
// System.out.println("Tw1");
long t1 = System.nanoTime();
Table result =
estore.query(
"CREATE (:`org.estore.eval.ldbc.finbench.util.Person` {personId: 1, personName:"
+ " 'George'})-[:Own]->(:`org.estore.eval.ldbc.finbench.util.Account`"
+ " {accountId: 1020342322, createTime: '26th March', isBlocked: False,"
+ " accountType: 'brokerage account'})");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000.0 + "ms");
EvalUtil.printQueryTime("Tw1", t1);
}

@CompileQuery
@Test
public void testTw2() {
// System.out.println("Tw2");
long t1 = System.nanoTime();
Table result =
estore.query(
"CREATE (:`org.estore.eval.ldbc.finbench.util.Company` {companyId: 12345,"
+ " companyName: 'Rand'})-[:Own]->(:`org.estore.eval.ldbc.finbench.util.Account`"
+ " {accountId: 1213243435, createTime: 'February 5th', isBlocked: False,"
+ " accountType: 'brokerage account'})");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000.0 + "ms");
EvalUtil.printQueryTime("Tw2", t1);
}

@CompileQuery
@Test
public void testTw3() {
// System.out.println("Tw3");
long t1 = System.nanoTime();
Table result =
estore.query(
" MATCH (dst:`org.estore.eval.ldbc.finbench.util.Account` {accountId:"
+ " 4619004367821865972}), (src:`org.estore.eval.ldbc.finbench.util.Account`"
+ " {accountId: 99079191802151398}) CREATE (dst)-[:Transfer]->(src)");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000.0 + "ms");
EvalUtil.printQueryTime("Tw3", t1);
}

@CompileQuery
@Test
public void testTw4() {
// System.out.println("Tw4");
long t1 = System.nanoTime();
Table result =
estore.query(
" MATCH (dst:`org.estore.eval.ldbc.finbench.util.Account` {accountId:"
+ " 4619004367821865972, accountType:'card'}),"
+ " (src:`org.estore.eval.ldbc.finbench.util.Account` {accountId:"
+ " 99079191802151398}) CREATE (dst)-[:Withdraw]->(src)");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000.0 + "ms");
EvalUtil.printQueryTime("Tw4", t1);
}

@CompileQuery
@Test
public void testTw8() {
// System.out.println("Tw8");
long t1 = System.nanoTime();
Table result =
estore.query(
"MATCH (acc:`org.estore.eval.ldbc.finbench.util.Account` {accountId:"
+ " 4700350636091245930}), (loan:`org.estore.eval.ldbc.finbench.util.Loan`"
+ " {loanId: 4684025087442027461}) CREATE (loan)-[:Deposit]->(acc)");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000.0 + "ms");
EvalUtil.printQueryTime("Tw8", t1);
}

@CompileQuery
@Test
public void testTw9() {
// System.out.println("Tw9");
long t1 = System.nanoTime();
Table result =
estore.query(
"MATCH (acc:`org.estore.eval.ldbc.finbench.util.Account` {accountId:"
+ " 4700350636091245930}), (loan:`org.estore.eval.ldbc.finbench.util.Loan`"
+ " {loanId: 4684025087442027461}) CREATE (acc)-[:Repay]->(loan)");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000.0 + "ms");
EvalUtil.printQueryTime("Tw9", t1);
}

@CompileQuery
@Test
public void testTw13() {
// System.out.println("Tw13");
long t1 = System.nanoTime();
Table result =
estore.query(
"MATCH (p1:`org.estore.eval.ldbc.finbench.util.Person` {personId: 2199023255767}),"
+ " (p2:`org.estore.eval.ldbc.finbench.util.Person` {personId: 10995116278183})"
+ " CREATE (p1)<-[:Guarantee]-(p2)");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000.0 + "ms");
EvalUtil.printQueryTime("Tw13", t1);
}

@CompileQuery
@Test
public void testTsr1() {
// System.out.println("Tsr1");
long t1 = System.nanoTime();
Table result =
estore.query(
"MATCH (account:`org.estore.eval.ldbc.finbench.util.Account` {accountId:"
+ " 4700350636091245930}) RETURN account.createTime, account.isBlocked,"
+ " account.accountType");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000.0 + "ms");
EvalUtil.printQueryTime("Tsr1", t1);
assertEquals(result.get("account.createTime").get(0), "2020-11-11 18:44:24.021");
assertEquals(result.get("account.isBlocked").get(0), false);
assertEquals(result.get("account.accountType").get(0), "certificate of deposit");
Expand Down
28 changes: 10 additions & 18 deletions estore/src/test/java/org/estore/eval/ldbc/snb/Snb01Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.estore.Estore;
import org.estore.EstoreOptions;
import org.estore.compiler.CompileQuery;
import org.estore.eval.EvalUtil;
import org.estore.eval.ldbc.snb.util.*;
import org.estore.planner.util.Table;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -32,49 +33,45 @@ public void setupData() throws Exception {
@CompileQuery
@Test
public void testInteractiveDeleteQuery2() {
// System.out.println("InteractiveDeleteQuery2");
long t1 = System.nanoTime();
Table result =
estore.query(
"MATCH (m:`org.estore.eval.ldbc.snb.util.Person`"
+ "{id:10995116278291})-[likes:LIKES2]->(:`org.estore.eval.ldbc.snb.util.Post`"
+ "{id:343597383821}) DELETE likes RETURN COUNT(m)");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000.0 + "ms");
EvalUtil.printQueryTime("InteractiveDeleteQuery2", t1);
assertEquals(result.get("COUNT(m)").get(0), 1);
}

@CompileQuery
@Test
public void testInteractiveDeleteQuery3() {
// System.out.println("InteractiveDeleteQuery3");
long t1 = System.nanoTime();
Table result =
estore.query(
"MATCH (m:`org.estore.eval.ldbc.snb.util.Person`"
+ " {id:19791209300608})-[likes:LIKES1]->(:`org.estore.eval.ldbc.snb.util.Comment`"
+ " {id:549755814421}) DELETE likes RETURN COUNT(m)");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000 + "ms");
EvalUtil.printQueryTime("InteractiveDeleteQuery3", t1);
assertEquals(result.get("COUNT(m)").get(0), 1);
}

@CompileQuery
@Test
public void testInteractiveDeleteQuery5() {
// System.out.println("InteractiveDeleteQuery5");
long t1 = System.nanoTime();
Table result =
estore.query(
"MATCH (m:`org.estore.eval.ldbc.snb.util.Forum`"
+ " {id:481036337162})-[hasMember:HAS_MEMBER]->(:`org.estore.eval.ldbc.snb.util.Person`"
+ " {id:2199023256077}) DELETE hasMember RETURN COUNT(m)");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000 + "ms");
EvalUtil.printQueryTime("InteractiveDeleteQuery5", t1);
assertEquals(result.get("COUNT(m)").get(0), 1);
}

@CompileQuery
@Test
public void testInteractiveShortQuery1() {
// System.out.println("InteractiveShortQuery1");
long t1 = System.nanoTime();
Table result =
estore.query(
Expand All @@ -83,7 +80,7 @@ public void testInteractiveShortQuery1() {
+ " RETURN n.firstName AS firstName, n.lastName AS lastName, n.birthday AS"
+ " birthday, n.locationIP AS locationIP, n.browserUsed AS browserUsed, p.id AS"
+ " cityId, n.gender AS gender, n.creationDate AS creationDate");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000 + "ms");
EvalUtil.printQueryTime("InteractiveShortQuery1", t1);
assertEquals(result.get("birthday").get(0), 579484800000L);
assertEquals(result.get("firstName").get(0), "Min-Jung");
assertEquals(result.get("lastName").get(0), "Park");
Expand All @@ -97,14 +94,13 @@ public void testInteractiveShortQuery1() {
@CompileQuery
@Test
public void testInteractiveShortQuery5() {
// System.out.println("InteractiveShortQuery5");
long t1 = System.nanoTime();
Table result =
estore.query(
"MATCH (m:`org.estore.eval.ldbc.snb.util.Comment`"
+ " {id:206158430603})-[:HAS_CREATOR]->(p:`org.estore.eval.ldbc.snb.util.Person`)"
+ " RETURN p.id AS personId, p.firstName AS firstName, p.lastName AS lastName");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000 + "ms");
EvalUtil.printQueryTime("InteractiveShortQuery5", t1);
assertEquals(result.get("firstName").get(0), "Rudolf");
assertEquals(result.get("lastName").get(0), "Engel");
assertEquals(result.get("personId").get(0), 2199023256437L);
Expand All @@ -113,56 +109,52 @@ public void testInteractiveShortQuery5() {
@CompileQuery
@Test
public void testInteractiveUpdateQuery2() {
// System.out.println("InteractiveUpdateQuery2");
long t1 = System.nanoTime();
Table result =
estore.query( // error here
"MATCH (person:`org.estore.eval.ldbc.snb.util.Person` {id:10995116278291}),"
+ " (post:`org.estore.eval.ldbc.snb.util.Post` {id:481036337280}) CREATE"
+ " (person)-[r:LIKES2]->(post) RETURN COUNT(r)");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000 + "ms");
EvalUtil.printQueryTime("InteractiveUpdateQuery2", t1);
assertEquals(result.get("COUNT(r)").get(0), 1);
}

@CompileQuery
@Test
public void testInteractiveUpdateQuery3() {
// System.out.println("InteractiveUpdateQuery3");
long t1 = System.nanoTime();
Table result =
estore.query(
"MATCH (person:`org.estore.eval.ldbc.snb.util.Person` {id:19791209301454}),"
+ " (comment:`org.estore.eval.ldbc.snb.util.Comment` {id:481036337631}) CREATE"
+ " (person)-[r:LIKES1]->(comment) RETURN COUNT(r)");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000 + "ms");
EvalUtil.printQueryTime("InteractiveUpdateQuery3", t1);
assertEquals(result.get("COUNT(r)").get(0), 1);
}

@CompileQuery
@Test
public void testInteractiveUpdateQuery5() {
// System.out.println("InteractiveUpdateQuery5");
long t1 = System.nanoTime();
Table result =
estore.query(
"MATCH (f:`org.estore.eval.ldbc.snb.util.Forum` {id:549755813984}),"
+ " (p:`org.estore.eval.ldbc.snb.util.Person` {id:19791209300852}) CREATE"
+ " (f)-[r:HAS_MEMBER]->(p) RETURN COUNT(r)");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000 + "ms");
EvalUtil.printQueryTime("InteractiveUpdateQuery5", t1);
assertEquals(result.get("COUNT(r)").get(0), 1);
}

@CompileQuery
@Test
public void testInteractiveUpdateQuery8() {
// System.out.println("InteractiveUpdateQuery8");
long t1 = System.nanoTime();
Table result =
estore.query(
"MATCH (p1:`org.estore.eval.ldbc.snb.util.Person` {id:4398046512167}),"
+ " (p2:`org.estore.eval.ldbc.snb.util.Person` {id:2199023256816}) CREATE"
+ " (p1)-[r:KNOWS]->(p2) RETURN COUNT(r)");
// System.out.println("Time: " + ((float) (System.nanoTime() - t1)) / 1_000_000 + "ms");
EvalUtil.printQueryTime("InteractiveUpdateQuery8", t1);
assertEquals(result.get("COUNT(r)").get(0), 1);
}

Expand Down
Loading
Loading