greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Update Android and iOS SDKs to reflect new named in memory functions. Utilize named in memory store in tests to ensure isolation when running.

Browse source
This commit is contained in:
Emily Toop 2018-07-04 14:51:04 +01:00
parent e1c2c9ee77
commit b361ea8119
6 changed files with 147 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/JNA.java
View file

@ -43,6 +43,7 @@ public interface JNA extends Library {
class EntityBuilder extends PointerType {}
Store store_open(String dbPath, RustError.ByReference err);
Store store_open_named_in_memory_store(String name, RustError.ByReference err);
void destroy(Pointer obj);
void uuid_destroy(Pointer obj);

12
sdks/android/Mentat/library/src/main/java/org/mozilla/mentat/Mentat.java
View file

@ -28,7 +28,7 @@ public class Mentat extends RustObject<JNA.Store> {
private Mentat(JNA.Store rawPointer) { super(rawPointer); }
/**
* Open a connection to an in-memory Mentat Store.
* Open a connection to an anonymous in-memory Store.
*/
public static Mentat open() {
return open("");
@ -51,6 +51,16 @@ public class Mentat extends RustObject<JNA.Store> {
return new Mentat(store);
}
/**
* Open a connection to a named in-memory Store.
* @param name The named to be given to the in memory store to open.
* @return An instance of Mentat connected to a named in memory store.
*/
public static Mentat namedInMemoryStore(String name) {
RustError.ByReference err = new RustError.ByReference();
return new Mentat(JNA.INSTANCE.store_open_named_in_memory_store(name, err));
}
/**
* Add an attribute to the cache. The {@link CacheDirection} determines how that attribute can be
* looked up.

80
sdks/android/Mentat/library/src/test/java/org/mozilla/mentat/FFIIntegrationTest.java
View file

@ -116,9 +116,9 @@ public class FFIIntegrationTest {
return mentat.transact(seattleData);
}
public Mentat openAndInitializeCitiesStore() {
public Mentat openAndInitializeCitiesStore(String name) {
if (this.mentat == null) {
this.mentat = Mentat.open();
this.mentat = Mentat.namedInMemoryStore(name);
this.transactCitiesSchema(mentat);
this.transactSeattleData(mentat);
}
@ -181,7 +181,7 @@ public class FFIIntegrationTest {
@Test
public void transactingVocabularySucceeds() {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("transactingVocabularySucceeds");
TxReport schemaReport = this.transactCitiesSchema(mentat);
assertNotNull(schemaReport);
assertTrue(schemaReport.getTxId() > 0);
@ -189,7 +189,7 @@ public class FFIIntegrationTest {
@Test
public void transactingEntitiesSucceeds() {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("transactingEntitiesSucceeds");
this.transactCitiesSchema(mentat);
TxReport dataReport = this.transactSeattleData(mentat);
assertNotNull(dataReport);
@ -200,7 +200,7 @@ public class FFIIntegrationTest {
@Test
public void runScalarSucceeds() throws InterruptedException {
Mentat mentat = openAndInitializeCitiesStore();
Mentat mentat = openAndInitializeCitiesStore("runScalarSucceeds");
String query = "[:find ?n . :in ?name :where [(fulltext $ :community/name ?name) [[?e ?n]]]]";
final CountDownLatch expectation = new CountDownLatch(1);
mentat.query(query).bind("?name", "Wallingford").run(new ScalarResultHandler() {
@ -216,7 +216,7 @@ public class FFIIntegrationTest {
@Test
public void runCollSucceeds() throws InterruptedException {
Mentat mentat = openAndInitializeCitiesStore();
Mentat mentat = openAndInitializeCitiesStore("runCollSucceeds");
String query = "[:find [?when ...] :where [_ :db/txInstant ?when] :order (asc ?when)]";
final CountDownLatch expectation = new CountDownLatch(1);
mentat.query(query).run(new CollResultHandler() {
@ -234,7 +234,7 @@ public class FFIIntegrationTest {
@Test
public void runCollResultIteratorSucceeds() throws InterruptedException {
Mentat mentat = openAndInitializeCitiesStore();
Mentat mentat = openAndInitializeCitiesStore("runCollResultIteratorSucceeds");
String query = "[:find [?when ...] :where [_ :db/txInstant ?when] :order (asc ?when)]";
final CountDownLatch expectation = new CountDownLatch(1);
mentat.query(query).run(new CollResultHandler() {
@ -253,7 +253,7 @@ public class FFIIntegrationTest {
@Test
public void runTupleSucceeds() throws InterruptedException {
Mentat mentat = openAndInitializeCitiesStore();
Mentat mentat = openAndInitializeCitiesStore("runTupleSucceeds");
String query = "[:find [?name ?cat]\n" +
" :where\n" +
" [?c :community/name ?name]\n" +
@ -276,7 +276,7 @@ public class FFIIntegrationTest {
@Test
public void runRelIteratorSucceeds() throws InterruptedException {
Mentat mentat = openAndInitializeCitiesStore();
Mentat mentat = openAndInitializeCitiesStore("runRelIteratorSucceeds");
String query = "[:find ?name ?cat\n" +
" :where\n" +
" [?c :community/name ?name]\n" +
@ -313,7 +313,7 @@ public class FFIIntegrationTest {
@Test
public void runRelSucceeds() throws InterruptedException {
Mentat mentat = openAndInitializeCitiesStore();
Mentat mentat = openAndInitializeCitiesStore("runRelSucceeds");
String query = "[:find ?name ?cat\n" +
" :where\n" +
" [?c :community/name ?name]\n" +
@ -349,7 +349,7 @@ public class FFIIntegrationTest {
@Test
public void bindingLongValueSucceeds() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("bindingLongValueSucceeds");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
final Long aEntid = report.getEntidForTempId("a");
String query = "[:find ?e . :in ?long :where [?e :foo/long ?long]]";
@ -367,7 +367,7 @@ public class FFIIntegrationTest {
@Test
public void bindingRefValueSucceeds() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("bindingRefValueSucceeds");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
long stringEntid = mentat.entIdForAttribute(":foo/string");
final Long bEntid = report.getEntidForTempId("b");
@ -386,7 +386,7 @@ public class FFIIntegrationTest {
@Test
public void bindingRefKwValueSucceeds() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("bindingRefKwValueSucceeds");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
String refKeyword = ":foo/string";
final Long bEntid = report.getEntidForTempId("b");
@ -405,7 +405,7 @@ public class FFIIntegrationTest {
@Test
public void bindingKwValueSucceeds() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("bindingKwValueSucceeds");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
final Long aEntid = report.getEntidForTempId("a");
String query = "[:find ?e . :in ?kw :where [?e :foo/keyword ?kw]]";
@ -422,8 +422,8 @@ public class FFIIntegrationTest {
}
@Test
public void bindingDateValueSucceeds() throws InterruptedException {
Mentat mentat = Mentat.open();
public void bindingDateValueSucceeds() throws InterruptedException, ParseException {
Mentat mentat = Mentat.namedInMemoryStore("bindingDateValueSucceeds");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
final Long aEntid = report.getEntidForTempId("a");
@ -445,7 +445,7 @@ public class FFIIntegrationTest {
@Test
public void bindingStringValueSucceeds() throws InterruptedException {
Mentat mentat = this.openAndInitializeCitiesStore();
Mentat mentat = this.openAndInitializeCitiesStore("bindingStringValueSucceeds");
String query = "[:find ?n . :in ?name :where [(fulltext $ :community/name ?name) [[?e ?n]]]]";
final CountDownLatch expectation = new CountDownLatch(1);
mentat.query(query).bind("?name", "Wallingford").run(new ScalarResultHandler() {
@ -461,7 +461,7 @@ public class FFIIntegrationTest {
@Test
public void bindingUuidValueSucceeds() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("bindingUuidValueSucceeds");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
final Long aEntid = report.getEntidForTempId("a");
String query = "[:find ?e . :in ?uuid :where [?e :foo/uuid ?uuid]]";
@ -480,7 +480,7 @@ public class FFIIntegrationTest {
@Test
public void bindingBooleanValueSucceeds() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("bindingBooleanValueSucceeds");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
final Long aEntid = report.getEntidForTempId("a");
String query = "[:find ?e . :in ?bool :where [?e :foo/boolean ?bool]]";
@ -499,7 +499,7 @@ public class FFIIntegrationTest {
@Test
public void bindingDoubleValueSucceeds() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("bindingDoubleValueSucceeds");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
final Long aEntid = report.getEntidForTempId("a");
String query = "[:find ?e . :in ?double :where [?e :foo/double ?double]]";
@ -517,7 +517,7 @@ public class FFIIntegrationTest {
@Test
public void typedValueConvertsToLong() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("typedValueConvertsToLong");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
final Long aEntid = report.getEntidForTempId("a");
String query = "[:find ?v . :in ?e :where [?e :foo/long ?v]]";
@ -536,7 +536,7 @@ public class FFIIntegrationTest {
@Test
public void typedValueConvertsToRef() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("typedValueConvertsToRef");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
final Long aEntid = report.getEntidForTempId("a");
String query = "[:find ?e . :where [?e :foo/long 25]]";
@ -555,7 +555,7 @@ public class FFIIntegrationTest {
@Test
public void typedValueConvertsToKeyword() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("typedValueConvertsToKeyword");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
final Long aEntid = report.getEntidForTempId("a");
String query = "[:find ?v . :in ?e :where [?e :foo/keyword ?v]]";
@ -574,7 +574,7 @@ public class FFIIntegrationTest {
@Test
public void typedValueConvertsToBoolean() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("typedValueConvertsToBoolean");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
final Long aEntid = report.getEntidForTempId("a");
String query = "[:find ?v . :in ?e :where [?e :foo/boolean ?v]]";
@ -593,7 +593,7 @@ public class FFIIntegrationTest {
@Test
public void typedValueConvertsToDouble() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("typedValueConvertsToDouble");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
final Long aEntid = report.getEntidForTempId("a");
String query = "[:find ?v . :in ?e :where [?e :foo/double ?v]]";
@ -612,7 +612,7 @@ public class FFIIntegrationTest {
@Test
public void typedValueConvertsToDate() throws InterruptedException, ParseException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("typedValueConvertsToDate");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
final Long aEntid = report.getEntidForTempId("a");
String query = "[:find ?v . :in ?e :where [?e :foo/instant ?v]]";
@ -638,7 +638,7 @@ public class FFIIntegrationTest {
@Test
public void typedValueConvertsToString() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("typedValueConvertsToString");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
final Long aEntid = report.getEntidForTempId("a");
String query = "[:find ?v . :in ?e :where [?e :foo/string ?v]]";
@ -657,7 +657,7 @@ public class FFIIntegrationTest {
@Test
public void typedValueConvertsToUUID() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("typedValueConvertsToUUID");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
final Long aEntid = report.getEntidForTempId("a");
String query = "[:find ?v . :in ?e :where [?e :foo/uuid ?v]]";
@ -676,8 +676,8 @@ public class FFIIntegrationTest {
}
@Test
public void valueForAttributeOfEntitySucceeds() {
Mentat mentat = Mentat.open();
public void valueForAttributeOfEntitySucceeds() throws InterruptedException {
Mentat mentat = Mentat.namedInMemoryStore("valueForAttributeOfEntitySucceeds");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
final Long aEntid = report.getEntidForTempId("a");
TypedValue value = mentat.valueForAttributeOfEntity(":foo/long", aEntid);
@ -695,7 +695,7 @@ public class FFIIntegrationTest {
@Test
public void testInProgressTransact() {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("testInProgressTransact");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
assertNotNull(report);
@ -703,7 +703,7 @@ public class FFIIntegrationTest {
@Test
public void testInProgressRollback() {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("testInProgressRollback");
TxReport report = this.populateWithTypesSchema(mentat).dataReport;
assertNotNull(report);
long aEntid = report.getEntidForTempId("a");
@ -721,7 +721,7 @@ public class FFIIntegrationTest {
@Test
public void testInProgressEntityBuilder() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("testInProgressEntityBuilder");
DBSetupResult reports = this.populateWithTypesSchema(mentat);
long bEntid = reports.dataReport.getEntidForTempId("b");
final long longEntid = reports.schemaReport.getEntidForTempId("l");
@ -795,7 +795,7 @@ public class FFIIntegrationTest {
@Test
public void testEntityBuilderForEntid() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("testEntityBuilderForEntid");
DBSetupResult reports = this.populateWithTypesSchema(mentat);
long bEntid = reports.dataReport.getEntidForTempId("b");
final long longEntid = reports.schemaReport.getEntidForTempId("l");
@ -869,7 +869,7 @@ public class FFIIntegrationTest {
@Test
public void testEntityBuilderForTempid() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("testEntityBuilderForTempid");
DBSetupResult reports = this.populateWithTypesSchema(mentat);
final long longEntid = reports.schemaReport.getEntidForTempId("l");
@ -922,7 +922,7 @@ public class FFIIntegrationTest {
@Test
public void testInProgressBuilderTransact() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("testInProgressBuilderTransact");
DBSetupResult reports = this.populateWithTypesSchema(mentat);
long aEntid = reports.dataReport.getEntidForTempId("a");
long bEntid = reports.dataReport.getEntidForTempId("b");
@ -984,7 +984,7 @@ public class FFIIntegrationTest {
@Test
public void testEntityBuilderTransact() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("testEntityBuilderTransact");
DBSetupResult reports = this.populateWithTypesSchema(mentat);
long aEntid = reports.dataReport.getEntidForTempId("a");
long bEntid = reports.dataReport.getEntidForTempId("b");
@ -1047,7 +1047,7 @@ public class FFIIntegrationTest {
@Test
public void testEntityBuilderRetract() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("testEntityBuilderRetract");
DBSetupResult reports = this.populateWithTypesSchema(mentat);
long bEntid = reports.dataReport.getEntidForTempId("b");
final long longEntid = reports.schemaReport.getEntidForTempId("l");
@ -1111,7 +1111,7 @@ public class FFIIntegrationTest {
@Test
public void testInProgressBuilderRetract() throws InterruptedException {
Mentat mentat = Mentat.open();
Mentat mentat = Mentat.namedInMemoryStore("testInProgressBuilderRetract");
DBSetupResult reports = this.populateWithTypesSchema(mentat);
long bEntid = reports.dataReport.getEntidForTempId("b");
final long longEntid = reports.schemaReport.getEntidForTempId("l");
@ -1180,7 +1180,7 @@ public class FFIIntegrationTest {
" [?neighborhood :neighborhood/district ?d]\n" +
" [?d :district/name ?district]]";
Mentat mentat = openAndInitializeCitiesStore();
Mentat mentat = openAndInitializeCitiesStore("testCaching");
final CountDownLatch expectation1 = new CountDownLatch(1);
final QueryTimer uncachedTimer = new QueryTimer();

11
sdks/swift/Mentat/Mentat/Mentat.swift
View file

@ -62,6 +62,17 @@ open class Mentat: RustObject {
return Mentat(raw: try RustError.unwrap({err in store_open(storeURI, err) }))
}
/**
Open a connection to a Store in a given location.
If the store does not already exist, one will be created.
- Parameter storeURI: The URI as a String of the store to open.
If no store URI is provided, an in-memory store will be opened.
*/
public convenience init(namedInMemoryStore name: String) throws {
self.init(raw: try RustError.unwrap({err in store_open_named_in_memory_store(name, err) }))
}
/**
Add an attribute to the cache. The {@link CacheDirection} determines how that attribute can be
looked up.

1
sdks/swift/Mentat/Mentat/store.h
View file

@ -103,6 +103,7 @@ typedef NS_ENUM(NSInteger, ValueType) {
// Store
struct Store*_Nonnull store_open(const char*_Nonnull uri, struct RustError* _Nonnull error);
struct Store*_Nonnull store_open_named_in_memory_store(const char*_Nonnull name, struct RustError* _Nonnull error);
// Destructors.
void destroy(void* _Nullable obj);

161
sdks/swift/Mentat/MentatTests/MentatTests.swift
View file

@ -33,6 +33,11 @@ class MentatTests: XCTestCase {
XCTAssertNotNil(try Mentat.open().raw)
}
// test that a store can be opened in memory
func testOpenNamedInMemoryStore() {
XCTAssertNotNil(try Mentat(namedInMemoryStore: "testOpenInMemoryStore").raw)
}
// test that a store can be opened in a specific location
func testOpenStoreInLocation() {
let documentsURL = NSURL(fileURLWithPath: NSTemporaryDirectory())
@ -77,9 +82,9 @@ class MentatTests: XCTestCase {
return report
}
func openAndInitializeCitiesStore() -> Mentat {
func openAndInitializeCitiesStore() throws -> Mentat {
guard let mentat = self.store else {
let mentat = try! Mentat.open()
let mentat = try Mentat(namedInMemoryStore: "openAndInitializeCitiesStore")
let _ = try! self.transactCitiesSchema(mentat: mentat)
let _ = try! self.transactSeattleData(mentat: mentat)
self.store = mentat
@ -153,7 +158,7 @@ class MentatTests: XCTestCase {
func test1TransactVocabulary() {
do {
let mentat = try Mentat.open()
let mentat = try Mentat(namedInMemoryStore: "test1TransactVocabulary")
let vocab = try readCitiesSchema()
let report = try mentat.transact(transaction: vocab)
XCTAssertNotNil(report)
@ -165,7 +170,7 @@ class MentatTests: XCTestCase {
func test2TransactEntities() {
do {
let mentat = try Mentat.open()
let mentat = try Mentat(namedInMemoryStore: "test2TransactEntities")
let vocab = try readCitiesSchema()
let _ = try mentat.transact(transaction: vocab)
let data = try readSeattleData()
@ -179,8 +184,8 @@ class MentatTests: XCTestCase {
}
}
func testQueryScalar() {
let mentat = openAndInitializeCitiesStore()
func testQueryScalar() throws {
let mentat = try openAndInitializeCitiesStore()
let query = "[:find ?n . :in ?name :where [(fulltext $ :community/name ?name) [[?e ?n]]]]"
let expect = expectation(description: "Query is executed")
XCTAssertNoThrow(try mentat.query(query: query).bind(varName: "?name", toString: "Wallingford").runScalar(callback: { scalarResult in
@ -197,8 +202,8 @@ class MentatTests: XCTestCase {
}
}
func testQueryColl() {
let mentat = openAndInitializeCitiesStore()
func testQueryColl() throws {
let mentat = try openAndInitializeCitiesStore()
let query = "[:find [?when ...] :where [_ :db/txInstant ?when] :order (asc ?when)]"
let expect = expectation(description: "Query is executed")
XCTAssertNoThrow(try mentat.query(query: query).runColl(callback: { collResult in
@ -219,8 +224,8 @@ class MentatTests: XCTestCase {
}
}
func testQueryCollResultIterator() {
let mentat = openAndInitializeCitiesStore()
func testQueryCollResultIterator() throws {
let mentat = try openAndInitializeCitiesStore()
let query = "[:find [?when ...] :where [_ :db/txInstant ?when] :order (asc ?when)]"
let expect = expectation(description: "Query is executed")
XCTAssertNoThrow(try mentat.query(query: query).runColl(callback: { collResult in
@ -240,8 +245,8 @@ class MentatTests: XCTestCase {
}
}
func testQueryTuple() {
let mentat = openAndInitializeCitiesStore()
func testQueryTuple() throws {
let mentat = try openAndInitializeCitiesStore()
let query = """
[:find [?name ?cat]
:where
@ -267,8 +272,8 @@ class MentatTests: XCTestCase {
}
}
func testQueryRel() {
let mentat = openAndInitializeCitiesStore()
func testQueryRel() throws {
let mentat = try openAndInitializeCitiesStore()
let query = """
[:find ?name ?cat
:where
@ -300,8 +305,8 @@ class MentatTests: XCTestCase {
}
}
func testQueryRelResultIterator() {
let mentat = openAndInitializeCitiesStore()
func testQueryRelResultIterator() throws {
let mentat = try openAndInitializeCitiesStore()
let query = """
[:find ?name ?cat
:where
@ -336,8 +341,8 @@ class MentatTests: XCTestCase {
}
}
func testBindLong() {
let mentat = try! Mentat.open()
func testBindLong() throws {
let mentat = try Mentat(namedInMemoryStore: "testBindLong")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = report!.entid(forTempId: "a")
let query = "[:find ?e . :in ?long :where [?e :foo/long ?long]]"
@ -356,8 +361,8 @@ class MentatTests: XCTestCase {
}
}
func testBindRef() {
let mentat = try! Mentat.open()
func testBindRef() throws {
let mentat = try Mentat(namedInMemoryStore: "testBindRef")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let stringEntid = mentat.entidForAttribute(attribute: ":foo/string")
let bEntid = report!.entid(forTempId: "b")
@ -377,8 +382,8 @@ class MentatTests: XCTestCase {
}
}
func testBindKwRef() {
let mentat = try! Mentat.open()
func testBindKwRef() throws {
let mentat = try Mentat(namedInMemoryStore: "testBindKwRef")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let bEntid = report!.entid(forTempId: "b")
let query = "[:find ?e . :in ?ref :where [?e :foo/ref ?ref]]"
@ -397,8 +402,8 @@ class MentatTests: XCTestCase {
}
}
func testBindKw() {
let mentat = try! Mentat.open()
func testBindKw() throws {
let mentat = try Mentat(namedInMemoryStore: "testBindKw")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = report!.entid(forTempId: "a")
let query = "[:find ?e . :in ?kw :where [?e :foo/keyword ?kw]]"
@ -417,8 +422,8 @@ class MentatTests: XCTestCase {
}
}
func testBindDate() {
let mentat = try! Mentat.open()
func testBindDate() throws {
let mentat = try Mentat(namedInMemoryStore: "testBindDate")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = report!.entid(forTempId: "a")
let query = "[:find [?e ?d] :in ?now :where [?e :foo/instant ?d] [(< ?d ?now)]]"
@ -443,8 +448,8 @@ class MentatTests: XCTestCase {
}
func testBindString() {
let mentat = openAndInitializeCitiesStore()
func testBindString() throws {
let mentat = try openAndInitializeCitiesStore()
let query = "[:find ?n . :in ?name :where [(fulltext $ :community/name ?name) [[?e ?n]]]]"
let expect = expectation(description: "Query is executed")
XCTAssertNoThrow(try mentat.query(query: query)
@ -463,8 +468,8 @@ class MentatTests: XCTestCase {
}
}
func testBindUuid() {
let mentat = try! Mentat.open()
func testBindUuid() throws {
let mentat = try Mentat(namedInMemoryStore: "testBindUuid")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = report!.entid(forTempId: "a")
let query = "[:find ?e . :in ?uuid :where [?e :foo/uuid ?uuid]]"
@ -484,8 +489,8 @@ class MentatTests: XCTestCase {
}
}
func testBindBoolean() {
let mentat = try! Mentat.open()
func testBindBoolean() throws {
let mentat = try Mentat(namedInMemoryStore: "testBindBoolean")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = report!.entid(forTempId: "a")
let query = "[:find ?e . :in ?bool :where [?e :foo/boolean ?bool]]"
@ -504,8 +509,8 @@ class MentatTests: XCTestCase {
}
}
func testBindDouble() {
let mentat = try! Mentat.open()
func testBindDouble() throws {
let mentat = try Mentat(namedInMemoryStore: "testBindDouble")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = report!.entid(forTempId: "a")
let query = "[:find ?e . :in ?double :where [?e :foo/double ?double]]"
@ -524,8 +529,8 @@ class MentatTests: XCTestCase {
}
}
func testTypedValueAsLong() {
let mentat = try! Mentat.open()
func testTypedValueAsLong() throws {
let mentat = try Mentat(namedInMemoryStore: "testTypedValueAsLong")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = report!.entid(forTempId: "a")!
let query = "[:find ?v . :in ?e :where [?e :foo/long ?v]]"
@ -545,8 +550,8 @@ class MentatTests: XCTestCase {
}
}
func testTypedValueAsRef() {
let mentat = try! Mentat.open()
func testTypedValueAsRef() throws {
let mentat = try Mentat(namedInMemoryStore: "testTypedValueAsRef")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = report!.entid(forTempId: "a")!
let query = "[:find ?e . :where [?e :foo/long 25]]"
@ -565,8 +570,8 @@ class MentatTests: XCTestCase {
}
}
func testTypedValueAsKw() {
let mentat = try! Mentat.open()
func testTypedValueAsKw() throws {
let mentat = try Mentat(namedInMemoryStore: "testTypedValueAsKw")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = report!.entid(forTempId: "a")!
let query = "[:find ?v . :in ?e :where [?e :foo/keyword ?v]]"
@ -586,8 +591,8 @@ class MentatTests: XCTestCase {
}
}
func testTypedValueAsBoolean() {
let mentat = try! Mentat.open()
func testTypedValueAsBoolean() throws {
let mentat = try Mentat(namedInMemoryStore: "testTypedValueAsBoolean")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = report!.entid(forTempId: "a")!
let query = "[:find ?v . :in ?e :where [?e :foo/boolean ?v]]"
@ -607,8 +612,8 @@ class MentatTests: XCTestCase {
}
}
func testTypedValueAsDouble() {
let mentat = try! Mentat.open()
func testTypedValueAsDouble() throws {
let mentat = try Mentat(namedInMemoryStore: "testTypedValueAsDouble")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = report!.entid(forTempId: "a")!
let query = "[:find ?v . :in ?e :where [?e :foo/double ?v]]"
@ -628,8 +633,8 @@ class MentatTests: XCTestCase {
}
}
func testTypedValueAsDate() {
let mentat = try! Mentat.open()
func testTypedValueAsDate() throws {
let mentat = try Mentat(namedInMemoryStore: "testTypedValueAsDate")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = report!.entid(forTempId: "a")!
let query = "[:find ?v . :in ?e :where [?e :foo/instant ?v]]"
@ -654,8 +659,8 @@ class MentatTests: XCTestCase {
}
}
func testTypedValueAsString() {
let mentat = try! Mentat.open()
func testTypedValueAsString() throws {
let mentat = try Mentat(namedInMemoryStore: "testTypedValueAsString")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = report!.entid(forTempId: "a")!
let query = "[:find ?v . :in ?e :where [?e :foo/string ?v]]"
@ -675,8 +680,8 @@ class MentatTests: XCTestCase {
}
}
func testTypedValueAsUuid() {
let mentat = try! Mentat.open()
func testTypedValueAsUuid() throws {
let mentat = try Mentat(namedInMemoryStore: "testTypedValueAsUuid")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = report!.entid(forTempId: "a")!
let query = "[:find ?v . :in ?e :where [?e :foo/uuid ?v]]"
@ -697,8 +702,8 @@ class MentatTests: XCTestCase {
}
}
func testValueForAttributeOfEntity() {
let mentat = try! Mentat.open()
func testValueForAttributeOfEntity() throws {
let mentat = try Mentat(namedInMemoryStore: "testValueForAttributeOfEntity")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = report!.entid(forTempId: "a")!
var value: TypedValue? = nil;
@ -707,15 +712,15 @@ class MentatTests: XCTestCase {
assert(value?.asLong() == 25)
}
func testEntidForAttribute() {
let mentat = try! Mentat.open()
func testEntidForAttribute() throws {
let mentat = try Mentat(namedInMemoryStore: "testEntidForAttribute")
let _ = self.populateWithTypesSchema(mentat: mentat)
let entid = mentat.entidForAttribute(attribute: ":foo/long")
assert(entid == 65540)
}
func testMultipleQueries() {
let mentat = try! Mentat.open()
func testMultipleQueries() throws {
let mentat = try Mentat(namedInMemoryStore: "testMultipleQueries")
let _ = self.populateWithTypesSchema(mentat: mentat)
let q1 = mentat.query(query: "[:find ?x :where [?x _ _]]")
@ -739,8 +744,8 @@ class MentatTests: XCTestCase {
}
}
func testNestedQueries() {
let mentat = try! Mentat.open()
func testNestedQueries() throws {
let mentat = try Mentat(namedInMemoryStore: "testNestedQueries")
let _ = self.populateWithTypesSchema(mentat: mentat)
let q1 = mentat.query(query: "[:find ?x :where [?x _ _]]")
let q2 = mentat.query(query: "[:find ?x :where [_ _ ?x]]")
@ -761,14 +766,14 @@ class MentatTests: XCTestCase {
}
}
func test3InProgressTransact() {
let mentat = try! Mentat.open()
func test3InProgressTransact() throws {
let mentat = try Mentat(namedInMemoryStore: "test3InProgressTransact")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
XCTAssertNotNil(report)
}
func testInProgressRollback() {
let mentat = try! Mentat.open()
func testInProgressRollback() throws {
let mentat = try Mentat(namedInMemoryStore: "testInProgressRollback")
let (_, report) = self.populateWithTypesSchema(mentat: mentat)
XCTAssertNotNil(report)
let aEntid = report!.entid(forTempId: "a")!
@ -785,8 +790,8 @@ class MentatTests: XCTestCase {
}
func testInProgressEntityBuilder() {
let mentat = try! Mentat.open()
func testInProgressEntityBuilder() throws {
let mentat = try Mentat(namedInMemoryStore: "testInProgressEntityBuilder")
let (schemaReport, dataReport) = self.populateWithTypesSchema(mentat: mentat)
let bEntid = dataReport!.entid(forTempId: "b")!
let longEntid = schemaReport!.entid(forTempId: "l")!
@ -850,8 +855,8 @@ class MentatTests: XCTestCase {
})
}
func testEntityBuilderForEntid() {
let mentat = try! Mentat.open()
func testEntityBuilderForEntid() throws {
let mentat = try Mentat(namedInMemoryStore: "testEntityBuilderForEntid")
let (schemaReport, dataReport) = self.populateWithTypesSchema(mentat: mentat)
let bEntid = dataReport!.entid(forTempId: "b")!
let longEntid = schemaReport!.entid(forTempId: "l")!
@ -915,8 +920,8 @@ class MentatTests: XCTestCase {
})
}
func testEntityBuilderForTempid() {
let mentat = try! Mentat.open()
func testEntityBuilderForTempid() throws {
let mentat = try Mentat(namedInMemoryStore: "testEntityBuilderForTempid")
let (schemaReport, _) = self.populateWithTypesSchema(mentat: mentat)
let longEntid = schemaReport!.entid(forTempId: "l")!
// test that the values are as expected
@ -962,8 +967,8 @@ class MentatTests: XCTestCase {
})
}
func testInProgressBuilderTransact() {
let mentat = try! Mentat.open()
func testInProgressBuilderTransact() throws {
let mentat = try Mentat(namedInMemoryStore: "testInProgressBuilderTransact")
let (schemaReport, dataReport) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = dataReport!.entid(forTempId: "a")!
let bEntid = dataReport!.entid(forTempId: "b")!
@ -1018,8 +1023,8 @@ class MentatTests: XCTestCase {
XCTAssertEqual(22, longValue?.asLong())
}
func testEntityBuilderTransact() {
let mentat = try! Mentat.open()
func testEntityBuilderTransact() throws {
let mentat = try Mentat(namedInMemoryStore: "testEntityBuilderTransact")
let (schemaReport, dataReport) = self.populateWithTypesSchema(mentat: mentat)
let aEntid = dataReport!.entid(forTempId: "a")!
let bEntid = dataReport!.entid(forTempId: "b")!
@ -1074,8 +1079,8 @@ class MentatTests: XCTestCase {
XCTAssertEqual(22, longValue?.asLong())
}
func testEntityBuilderRetract() {
let mentat = try! Mentat.open()
func testEntityBuilderRetract() throws {
let mentat = try Mentat(namedInMemoryStore: "testEntityBuilderRetract")
let (schemaReport, dataReport) = self.populateWithTypesSchema(mentat: mentat)
let bEntid = dataReport!.entid(forTempId: "b")!
let stringEntid = schemaReport!.entid(forTempId: "s")!
@ -1124,8 +1129,8 @@ class MentatTests: XCTestCase {
})
}
func testInProgressEntityBuilderRetract() {
let mentat = try! Mentat.open()
func testInProgressEntityBuilderRetract() throws {
let mentat = try Mentat(namedInMemoryStore: "testInProgressEntityBuilderRetract")
let (schemaReport, dataReport) = self.populateWithTypesSchema(mentat: mentat)
let bEntid = dataReport!.entid(forTempId: "b")!
let stringEntid = schemaReport!.entid(forTempId: "s")!
@ -1174,7 +1179,7 @@ class MentatTests: XCTestCase {
})
}
func testCaching() {
func testCaching() throws {
let query = """
[:find ?district :where
[?neighborhood :neighborhood/name \"Beacon Hill\"]
@ -1182,7 +1187,7 @@ class MentatTests: XCTestCase {
[?d :district/name ?district]]
"""
let mentat = openAndInitializeCitiesStore()
let mentat = try openAndInitializeCitiesStore()
struct QueryTimer {
private var _start: UInt64