Skip to content

Commit 8478839

Browse files
hkuichhkuich
committed
- updated to 2.0.1 and client 2.0.0
1 parent f262cc1 commit 8478839

File tree

12 files changed

+129
-127
lines changed

12 files changed

+129
-127
lines changed

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
group 'com.github.bayer-science-for-a-better-life'
8-
version '0.1.0-alpha-12'
8+
version '0.1.0'
99

1010
repositories {
1111
mavenCentral()
@@ -15,7 +15,7 @@ repositories {
1515
}
1616

1717
dependencies {
18-
compile group: 'io.grakn.client', name: 'grakn-client', version: '2.0.0-alpha-12'
18+
compile group: 'io.grakn.client', name: 'grakn-client', version: '2.0.0'
1919
testCompile group: 'junit', name: 'junit', version: '4.12'
2020
compile 'com.google.code.gson:gson:2.8.6'
2121
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'

‎src/main/java/generator/GeneratorUtil.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -243,15 +243,15 @@ public static Thing addAttributeOfColumnType(Thing statement,
243243
try {
244244
statement = statement.has(conceptType, Integer.parseInt(cleanedValue));
245245
} catch (NumberFormatException numberFormatException) {
246-
dataLogger.warn("current row has column of type <long> with non-<long> value - skipping column");
246+
dataLogger.warn(String.format("current row has column of type <long> for variable < %s > with non-<long> value - skipping column", conceptType));
247247
dataLogger.warn(numberFormatException.getMessage());
248248
}
249249
break;
250250
case "double":
251251
try {
252252
statement = statement.has(conceptType, Double.parseDouble(cleanedValue));
253253
} catch (NumberFormatException numberFormatException) {
254-
dataLogger.warn("current row has column of type <double> with non-<double> value - skipping column");
254+
dataLogger.warn(String.format("current row has column of type <double> for variable < %s > with non-<double> value - skipping column", conceptType));
255255
dataLogger.warn(numberFormatException.getMessage());
256256
}
257257
break;
@@ -261,7 +261,7 @@ public static Thing addAttributeOfColumnType(Thing statement,
261261
} else if (cleanedValue.toLowerCase().equals("false")) {
262262
statement = statement.has(conceptType, false);
263263
} else {
264-
dataLogger.warn("current row has column of type <boolean> with non-<boolean> value - skipping column");
264+
dataLogger.warn(String.format("current row has column of type <boolean> for variable < %s > with non-<boolean> value - skipping column", conceptType));
265265
}
266266
break;
267267
case "datetime":
@@ -278,7 +278,7 @@ public static Thing addAttributeOfColumnType(Thing statement,
278278
statement = statement.has(conceptType, dateTime);
279279
}
280280
} catch (DateTimeException dateTimeException) {
281-
dataLogger.warn("current row has column of type <datetime> with non-<ISO 8601 format> datetime value: ");
281+
dataLogger.warn(String.format("current row has column of type <datetime> for variable < %s > with non-<ISO 8601 format> datetime value: ", conceptType));
282282
dataLogger.warn(dateTimeException.getMessage());
283283
}
284284
break;
@@ -306,15 +306,15 @@ public static Relation addAttributeOfColumnType(Relation statement,
306306
try {
307307
statement = statement.has(conceptType, Integer.parseInt(cleanedValue));
308308
} catch (NumberFormatException numberFormatException) {
309-
dataLogger.warn("current row has column of type <long> with non-<long> value - skipping column");
309+
dataLogger.warn(String.format("current row has column of type <long> for variable < %s > with non-<long> value - skipping column", conceptType));
310310
dataLogger.warn(numberFormatException.getMessage());
311311
}
312312
break;
313313
case "double":
314314
try {
315315
statement = statement.has(conceptType, Double.parseDouble(cleanedValue));
316316
} catch (NumberFormatException numberFormatException) {
317-
dataLogger.warn("current row has column of type <double> with non-<double> value - skipping column");
317+
dataLogger.warn(String.format("current row has column of type <double> for variable < %s > with non-<double> value - skipping column", conceptType));
318318
dataLogger.warn(numberFormatException.getMessage());
319319
}
320320
break;
@@ -324,7 +324,7 @@ public static Relation addAttributeOfColumnType(Relation statement,
324324
} else if (cleanedValue.toLowerCase().equals("false")) {
325325
statement = statement.has(conceptType, false);
326326
} else {
327-
dataLogger.warn("current row has column of type <boolean> with non-<boolean> value - skipping column");
327+
dataLogger.warn(String.format("current row has column of type <boolean> for variable < %s > with non-<boolean> value - skipping column", conceptType));
328328
}
329329
break;
330330
case "datetime":
@@ -341,7 +341,7 @@ public static Relation addAttributeOfColumnType(Relation statement,
341341
statement = statement.has(conceptType, dateTime);
342342
}
343343
} catch (DateTimeException dateTimeException) {
344-
dataLogger.warn("current row has column of type <datetime> with non-<ISO 8601 format> datetime value: ");
344+
dataLogger.warn(String.format("current row has column of type <datetime> for variable < %s > with non-<ISO 8601 format> datetime value: ", conceptType));
345345
dataLogger.warn(dateTimeException.getMessage());
346346
}
347347
break;
@@ -371,15 +371,15 @@ public static Thing addAttributeOfColumnType(UnboundVariable statement,
371371
try {
372372
returnThing = statement.has(conceptType, Integer.parseInt(cleanedValue));
373373
} catch (NumberFormatException numberFormatException) {
374-
dataLogger.warn("current row has column of type <long> with non-<long> value - skipping column");
374+
dataLogger.warn(String.format("current row has column of type <long> for variable < %s > with non-<long> value - skipping column", conceptType));
375375
dataLogger.warn(numberFormatException.getMessage());
376376
}
377377
break;
378378
case "double":
379379
try {
380380
returnThing = statement.has(conceptType, Double.parseDouble(cleanedValue));
381381
} catch (NumberFormatException numberFormatException) {
382-
dataLogger.warn("current row has column of type <double> with non-<double> value - skipping column");
382+
dataLogger.warn(String.format("current row has column of type <double> for variable < %s > with non-<double> value - skipping column", conceptType));
383383
dataLogger.warn(numberFormatException.getMessage());
384384
}
385385
break;
@@ -389,7 +389,7 @@ public static Thing addAttributeOfColumnType(UnboundVariable statement,
389389
} else if (cleanedValue.toLowerCase().equals("false")) {
390390
returnThing = statement.has(conceptType, false);
391391
} else {
392-
dataLogger.warn("current row has column of type <boolean> with non-<boolean> value - skipping column");
392+
dataLogger.warn(String.format("current row has column of type <boolean> for variable < %s > with non-<boolean> value - skipping column", conceptType));
393393
}
394394
break;
395395
case "datetime":
@@ -406,7 +406,7 @@ public static Thing addAttributeOfColumnType(UnboundVariable statement,
406406
returnThing = statement.has(conceptType, dateTime);
407407
}
408408
} catch (DateTimeException dateTimeException) {
409-
dataLogger.warn("current row has column of type <datetime> with non-<ISO 8601 format> datetime value: ");
409+
dataLogger.warn(String.format("current row has column of type <datetime> for variable < %s > with non-<ISO 8601 format> datetime value: ", conceptType));
410410
dataLogger.warn(dateTimeException.getMessage());
411411
}
412412
break;

‎src/main/java/insert/GraknInserter.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package insert;
22

3-
import grakn.client.GraknClient;
4-
import grakn.client.GraknClient.Transaction;
5-
import grakn.client.GraknClient.Session;
3+
import grakn.client.Grakn;
4+
import grakn.client.api.GraknClient;
5+
import grakn.client.api.GraknSession;
6+
import grakn.client.api.GraknTransaction;
67
import graql.lang.Graql;
78
import graql.lang.pattern.variable.ThingVariable;
89
import graql.lang.query.GraqlDefine;
@@ -18,10 +19,10 @@
1819

1920
public class GraknInserter {
2021

22+
private static final Logger appLogger = LogManager.getLogger("com.bayer.dt.grami");
2123
private final String schemaPath;
2224
private final String databaseName;
2325
private final String graknURI;
24-
private static final Logger appLogger = LogManager.getLogger("com.bayer.dt.grami");
2526

2627
public GraknInserter(String graknURI, String port, String schemaPath, String databaseName) {
2728
this.schemaPath = schemaPath;
@@ -42,11 +43,11 @@ private void createDatabase(GraknClient client) {
4243
}
4344

4445
private void defineToGrakn(String schemaAsString, GraknClient client) {
45-
Session schemaSession = getSchemaSession(client);
46+
GraknSession schemaSession = getSchemaSession(client);
4647
GraqlDefine q = Graql.parseQuery(schemaAsString);
4748

4849

49-
Transaction writeTransaction = schemaSession.transaction(Transaction.Type.WRITE);
50+
GraknTransaction writeTransaction = schemaSession.transaction(GraknTransaction.Type.WRITE);
5051
writeTransaction.query().define(q);
5152
writeTransaction.commit();
5253
writeTransaction.close();
@@ -55,7 +56,7 @@ private void defineToGrakn(String schemaAsString, GraknClient client) {
5556
appLogger.info("Defined schema to database <" + databaseName + ">");
5657
}
5758

58-
public void matchInsertThreadedInserting(HashMap<String, ArrayList<ArrayList<ThingVariable<?>>>> statements, Session session, int threads, int batchSize) throws InterruptedException {
59+
public void matchInsertThreadedInserting(HashMap<String, ArrayList<ArrayList<ThingVariable<?>>>> statements, GraknSession session, int threads, int batchSize) throws InterruptedException {
5960

6061
AtomicInteger queryIndex = new AtomicInteger(0);
6162
Thread[] ts = new Thread[threads];
@@ -66,7 +67,7 @@ public void matchInsertThreadedInserting(HashMap<String, ArrayList<ArrayList<Thi
6667
ArrayList<ArrayList<ThingVariable<?>>> insertStatements = statements.get("insert");
6768

6869
while (queryIndex.get() < matchStatements.size()) {
69-
try (Transaction tx = session.transaction(Transaction.Type.WRITE)) {
70+
try (GraknTransaction tx = session.transaction(GraknTransaction.Type.WRITE)) {
7071
int q;
7172
for (int i = 0; i < batchSize && (q = queryIndex.getAndIncrement()) < matchStatements.size(); i++) {
7273
ArrayList<ThingVariable<?>> rowMatchStatements = matchStatements.get(q);
@@ -90,15 +91,15 @@ public void matchInsertThreadedInserting(HashMap<String, ArrayList<ArrayList<Thi
9091
}
9192
}
9293

93-
public void insertThreadedInserting(ArrayList<ThingVariable<?>> statements, Session session, int threads, int batchSize) throws InterruptedException {
94+
public void insertThreadedInserting(ArrayList<ThingVariable<?>> statements, GraknSession session, int threads, int batchSize) throws InterruptedException {
9495

9596
AtomicInteger queryIndex = new AtomicInteger(0);
9697
Thread[] ts = new Thread[threads];
9798

9899
Runnable insertThread =
99100
() -> {
100101
while (queryIndex.get() < statements.size()) {
101-
try (Transaction tx = session.transaction(Transaction.Type.WRITE)) {
102+
try (GraknTransaction tx = session.transaction(GraknTransaction.Type.WRITE)) {
102103
int q;
103104
for (int i = 0; i < batchSize && (q = queryIndex.getAndIncrement()) < statements.size(); i++) {
104105
GraqlInsert query = Graql.insert(statements.get(q));
@@ -120,16 +121,16 @@ public void insertThreadedInserting(ArrayList<ThingVariable<?>> statements, Sess
120121
}
121122

122123
// Utility functions
123-
public Session getDataSession(GraknClient client) {
124-
return client.session(databaseName, Session.Type.DATA);
124+
public GraknSession getDataSession(GraknClient client) {
125+
return client.session(databaseName, GraknSession.Type.DATA);
125126
}
126127

127-
public Session getSchemaSession(GraknClient client) {
128-
return client.session(databaseName, Session.Type.SCHEMA);
128+
public GraknSession getSchemaSession(GraknClient client) {
129+
return client.session(databaseName, GraknSession.Type.SCHEMA);
129130
}
130131

131132
public GraknClient getClient() {
132-
return GraknClient.core(graknURI);
133+
return Grakn.coreClient(graknURI);
133134
}
134135

135136
private void deleteDatabaseIfExists(GraknClient client) {

0 commit comments

Comments
 (0)