Skip to content

Commit a023a8f

Browse files
szarnyasgszarnyasg
authored
Merge pull request #101 from ldbc/dev
Release 0.3.1
2 parents 90f658e + 452ad5a commit a023a8f

File tree

73 files changed

+197
-129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+197
-129
lines changed

‎pom.xml

+41-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.ldbc.driver</groupId>
77
<artifactId>jeeves</artifactId>
8-
<version>0.3-SNAPSHOT</version>
8+
<version>0.3.1</version>
99
<packaging>jar</packaging>
1010

1111
<name>LDBC Driver</name>
@@ -16,7 +16,7 @@
1616
<properties>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<maven.assembly.version>2.4</maven.assembly.version>
19-
<jackson.api.version>1.9.13</jackson.api.version>
19+
<jackson.api.version>2.6.5</jackson.api.version>
2020
<junit.version>4.12</junit.version>
2121
<hamcrest.version>1.3</hamcrest.version>
2222
<commons.io.version>2.4</commons.io.version>
@@ -88,13 +88,13 @@
8888
<version>${log4j.version}</version>
8989
</dependency>
9090
<dependency>
91-
<groupId>org.codehaus.jackson</groupId>
92-
<artifactId>jackson-mapper-asl</artifactId>
91+
<groupId>com.fasterxml.jackson.core</groupId>
92+
<artifactId>jackson-databind</artifactId>
9393
<version>${jackson.api.version}</version>
9494
</dependency>
9595
<dependency>
96-
<groupId>org.codehaus.jackson</groupId>
97-
<artifactId>jackson-core-asl</artifactId>
96+
<groupId>com.fasterxml.jackson.core</groupId>
97+
<artifactId>jackson-core</artifactId>
9898
<version>${jackson.api.version}</version>
9999
</dependency>
100100
<dependency>
@@ -131,6 +131,7 @@
131131
</execution>
132132
</executions>
133133
<configuration>
134+
<finalName>${project.artifactId}-standalone</finalName>
134135
<transformers>
135136
<transformer
136137
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -179,4 +180,38 @@
179180
</plugin>
180181
</plugins>
181182
</build>
183+
184+
<profiles>
185+
<profile>
186+
<repositories>
187+
<repository>
188+
<snapshots>
189+
<enabled>false</enabled>
190+
</snapshots>
191+
<id>bintray-ldbc-snb</id>
192+
<name>bintray</name>
193+
<url>https://dl.bintray.com/ldbc/snb</url>
194+
</repository>
195+
</repositories>
196+
<pluginRepositories>
197+
<pluginRepository>
198+
<snapshots>
199+
<enabled>false</enabled>
200+
</snapshots>
201+
<id>bintray-ldbc-snb</id>
202+
<name>bintray-plugins</name>
203+
<url>https://dl.bintray.com/ldbc/snb</url>
204+
</pluginRepository>
205+
</pluginRepositories>
206+
<id>bintray</id>
207+
</profile>
208+
</profiles>
209+
210+
<distributionManagement>
211+
<repository>
212+
<id>bintray-ldbc-snb</id>
213+
<name>ldbc-snb</name>
214+
<url>https://api.bintray.com/maven/ldbc/snb/jeeves/;publish=1</url>
215+
</repository>
216+
</distributionManagement>
182217
</project>

‎src/main/java/com/ldbc/driver/client/ExecuteWorkloadMode.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
import java.io.IOException;
4343
import java.nio.charset.StandardCharsets;
4444
import java.nio.file.Files;
45+
import java.time.Duration;
46+
import java.time.Instant;
4547
import java.util.concurrent.TimeUnit;
4648

4749
import static java.lang.String.format;
@@ -132,8 +134,10 @@ public Object startExecutionAndAwaitCompletion() throws ClientException
132134
try
133135
{
134136
loggingService.info( "Shutting down database connector..." );
137+
Instant dbShutdownStart = Instant.now();
135138
database.close();
136-
loggingService.info( "Database connector shutdown successfully" );
139+
Duration shutdownDuration = Duration.between( dbShutdownStart, Instant.now() );
140+
loggingService.info( "Database connector shutdown successfully in: " + shutdownDuration );
137141
}
138142
catch ( IOException e )
139143
{

‎src/main/java/com/ldbc/driver/runtime/metrics/ContinuousMetricManager.java

+15-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,21 @@ public void addMeasurement( long value )
3535

3636
public ContinuousMetricSnapshot snapshot()
3737
{
38-
return new ContinuousMetricSnapshot( name, unit, count(), mean(), min(), max(), percentile50(), percentile90(),
39-
percentile95(), percentile99(),percentile99_9(), stdDev() );
38+
return new ContinuousMetricSnapshot(
39+
name,
40+
unit,
41+
count(),
42+
mean(),
43+
min(),
44+
max(),
45+
percentile25(),
46+
percentile50(),
47+
percentile75(),
48+
percentile90(),
49+
percentile95(),
50+
percentile99(),
51+
percentile99_9(),
52+
stdDev() );
4053
}
4154

4255
private long count()

‎src/main/java/com/ldbc/driver/runtime/metrics/ContinuousMetricSnapshot.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.ldbc.driver.runtime.metrics;
22

3-
import org.codehaus.jackson.annotate.JsonProperty;
3+
import com.fasterxml.jackson.annotation.JsonProperty;
44

55
import java.util.Objects;
66
import java.util.concurrent.TimeUnit;
@@ -46,7 +46,9 @@ private ContinuousMetricSnapshot()
4646
double mean,
4747
long min,
4848
long max,
49+
long percentile25,
4950
long percentile50,
51+
long percentile75,
5052
long percentile90,
5153
long percentile95,
5254
long percentile99,
@@ -59,7 +61,9 @@ private ContinuousMetricSnapshot()
5961
this.mean = mean;
6062
this.min = min;
6163
this.max = max;
64+
this.percentile25 = percentile25;
6265
this.percentile50 = percentile50;
66+
this.percentile75 = percentile75;
6367
this.percentile90 = percentile90;
6468
this.percentile95 = percentile95;
6569
this.percentile99 = percentile99;

‎src/main/java/com/ldbc/driver/runtime/metrics/DiscreteMetricSnapshot.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.ldbc.driver.runtime.metrics;
22

3-
import org.codehaus.jackson.annotate.JsonProperty;
3+
import com.fasterxml.jackson.annotation.JsonProperty;
44

55
import java.util.Map;
66

‎src/main/java/com/ldbc/driver/runtime/metrics/OperationMetricsSnapshot.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.ldbc.driver.runtime.metrics;
22

3-
import org.codehaus.jackson.annotate.JsonProperty;
3+
import com.fasterxml.jackson.annotation.JsonProperty;
44

55
import java.util.concurrent.TimeUnit;
66

‎src/main/java/com/ldbc/driver/runtime/metrics/WorkloadResultsSnapshot.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
package com.ldbc.driver.runtime.metrics;
22

3+
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
5+
import com.fasterxml.jackson.databind.ObjectMapper;
36
import com.google.common.collect.Lists;
47
import com.ldbc.driver.runtime.ConcurrentErrorReporter;
5-
import org.codehaus.jackson.annotate.JsonProperty;
6-
import org.codehaus.jackson.map.ObjectMapper;
7-
import org.codehaus.jackson.util.DefaultPrettyPrinter;
88

99
import java.io.File;
1010
import java.io.IOException;
1111
import java.util.Collections;
1212
import java.util.List;
13-
import java.util.Map;
1413
import java.util.concurrent.TimeUnit;
1514

1615
public class WorkloadResultsSnapshot

‎src/main/java/com/ldbc/driver/util/FileUtils.java

+13-8
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import java.io.UncheckedIOException;
1414
import java.nio.file.Files;
1515
import java.nio.file.Path;
16+
import java.time.Instant;
1617
import java.util.Arrays;
1718
import java.util.List;
1819
import java.util.stream.Stream;
@@ -148,8 +149,8 @@ public static void copyDir( File from, File to )
148149
try
149150
{
150151
System.out.println( format( "Copying directory...\n" +
151-
"From: %s\n" +
152-
"To: %s",
152+
"From: %s\n" +
153+
"To: %s",
153154
from.getAbsolutePath(),
154155
to.getAbsolutePath() ) );
155156
FileUtils.assertDirectoryExists( from );
@@ -177,9 +178,13 @@ public static long bytes( Path dir )
177178
for ( Path path : paths.collect( toList() ) )
178179
{
179180
if ( path.toFile().isFile() )
180-
{ bytes += path.toFile().length(); }
181+
{
182+
bytes += path.toFile().length();
183+
}
181184
else
182-
{ bytes += bytes( path ); }
185+
{
186+
bytes += bytes( path );
187+
}
183188
}
184189
return bytes;
185190
}
@@ -189,17 +194,17 @@ public static long bytes( Path dir )
189194
}
190195
}
191196

192-
public static void printlnsToFile( File file, String... lines )
197+
public static void printlnsToFile( File file, Instant timeStamp, String... lines )
193198
{
194199
try ( PrintWriter printer = new PrintWriter( new FileOutputStream( file, true ) ) )
195200
{
196-
Arrays.stream( lines ).forEach( printer::println );
201+
Arrays.stream( lines ).forEach( line -> printer.println( "[" + timeStamp + "] " + line ) );
197202
}
198203
catch ( FileNotFoundException e )
199204
{
200205
throw new RuntimeException( "Error writing line to file\n" +
201-
"Line: " + lines + "\n" +
202-
"File: " + file.getAbsolutePath(), e );
206+
"Line: " + lines + "\n" +
207+
"File: " + file.getAbsolutePath(), e );
203208
}
204209
}
205210

‎src/main/java/com/ldbc/driver/validation/DbValidationResult.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package com.ldbc.driver.validation;
22

3+
import com.fasterxml.jackson.core.type.TypeReference;
4+
import com.fasterxml.jackson.core.util.DefaultIndenter;
5+
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
6+
import com.fasterxml.jackson.databind.ObjectMapper;
37
import com.google.common.collect.Lists;
48
import com.ldbc.driver.Db;
59
import com.ldbc.driver.Operation;
@@ -10,9 +14,6 @@
1014
import com.ldbc.driver.util.Tuple;
1115
import com.ldbc.driver.util.Tuple2;
1216
import com.ldbc.driver.util.Tuple3;
13-
import org.codehaus.jackson.map.ObjectMapper;
14-
import org.codehaus.jackson.type.TypeReference;
15-
import org.codehaus.jackson.util.DefaultPrettyPrinter;
1617

1718
import java.io.IOException;
1819
import java.util.ArrayList;
@@ -51,7 +52,7 @@ public class DbValidationResult
5152
this.totalOperationsPerOperationType = new HashMap<>();
5253
this.objectMapper = new ObjectMapper();
5354
this.defaultPrettyPrinter = new DefaultPrettyPrinter();
54-
this.defaultPrettyPrinter.indentArraysWith( new DefaultPrettyPrinter.Lf2SpacesIndenter() );
55+
this.defaultPrettyPrinter.indentArraysWith( new DefaultIndenter(" ", DefaultIndenter.SYS_LF) );
5556
}
5657

5758
void reportMissingHandlerForOperation( Operation operation )

‎src/main/java/com/ldbc/driver/validation/ResultsLogValidationSummary.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.ldbc.driver.validation;
22

3-
import org.codehaus.jackson.annotate.JsonProperty;
4-
import org.codehaus.jackson.map.ObjectMapper;
5-
import org.codehaus.jackson.util.DefaultPrettyPrinter;
3+
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
5+
import com.fasterxml.jackson.databind.ObjectMapper;
66

77
import java.io.IOException;
88
import java.util.Map;

‎src/main/java/com/ldbc/driver/workloads/ldbc/snb/bi/LdbcSnbBiWorkload.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.ldbc.driver.workloads.ldbc.snb.bi;
22

3+
import com.fasterxml.jackson.core.type.TypeReference;
4+
import com.fasterxml.jackson.databind.ObjectMapper;
35
import com.ldbc.driver.ChildOperationGenerator;
46
import com.ldbc.driver.Operation;
57
import com.ldbc.driver.SerializingMarshallingException;
@@ -9,8 +11,6 @@
911
import com.ldbc.driver.control.ConsoleAndFileDriverConfiguration;
1012
import com.ldbc.driver.csv.charseeker.CharSeekerParams;
1113
import com.ldbc.driver.generator.GeneratorFactory;
12-
import org.codehaus.jackson.map.ObjectMapper;
13-
import org.codehaus.jackson.type.TypeReference;
1414

1515
import java.io.Closeable;
1616
import java.io.File;

‎src/main/java/com/ldbc/driver/workloads/ldbc/snb/bi/SerializationUtil.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.ldbc.driver.workloads.ldbc.snb.bi;
22

3+
import com.fasterxml.jackson.core.type.TypeReference;
4+
import com.fasterxml.jackson.databind.ObjectMapper;
35
import com.ldbc.driver.SerializingMarshallingException;
4-
import org.codehaus.jackson.map.ObjectMapper;
5-
import org.codehaus.jackson.type.TypeReference;
66

77
import java.io.IOException;
88
import java.util.List;

‎src/main/java/com/ldbc/driver/workloads/ldbc/snb/interactive/LdbcQuery1.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.ldbc.driver.workloads.ldbc.snb.interactive;
22

3+
import com.fasterxml.jackson.core.type.TypeReference;
4+
import com.fasterxml.jackson.databind.ObjectMapper;
35
import com.google.common.collect.ImmutableMap;
46
import com.google.common.collect.Lists;
57
import com.ldbc.driver.Operation;
68
import com.ldbc.driver.SerializingMarshallingException;
7-
import org.codehaus.jackson.map.ObjectMapper;
8-
import org.codehaus.jackson.type.TypeReference;
99

1010
import java.io.IOException;
1111
import java.util.ArrayList;

‎src/main/java/com/ldbc/driver/workloads/ldbc/snb/interactive/LdbcQuery10.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.ldbc.driver.workloads.ldbc.snb.interactive;
22

3+
import com.fasterxml.jackson.core.type.TypeReference;
4+
import com.fasterxml.jackson.databind.ObjectMapper;
35
import com.google.common.collect.ImmutableMap;
46
import com.ldbc.driver.Operation;
57
import com.ldbc.driver.SerializingMarshallingException;
6-
import org.codehaus.jackson.map.ObjectMapper;
7-
import org.codehaus.jackson.type.TypeReference;
88

99
import java.io.IOException;
1010
import java.util.ArrayList;

‎src/main/java/com/ldbc/driver/workloads/ldbc/snb/interactive/LdbcQuery11.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.ldbc.driver.workloads.ldbc.snb.interactive;
22

3+
import com.fasterxml.jackson.core.type.TypeReference;
4+
import com.fasterxml.jackson.databind.ObjectMapper;
35
import com.google.common.collect.ImmutableMap;
46
import com.ldbc.driver.Operation;
57
import com.ldbc.driver.SerializingMarshallingException;
6-
import org.codehaus.jackson.map.ObjectMapper;
7-
import org.codehaus.jackson.type.TypeReference;
88

99
import java.io.IOException;
1010
import java.util.ArrayList;

‎src/main/java/com/ldbc/driver/workloads/ldbc/snb/interactive/LdbcQuery12.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.ldbc.driver.workloads.ldbc.snb.interactive;
22

3+
import com.fasterxml.jackson.core.type.TypeReference;
4+
import com.fasterxml.jackson.databind.ObjectMapper;
35
import com.google.common.collect.ImmutableMap;
46
import com.ldbc.driver.Operation;
57
import com.ldbc.driver.SerializingMarshallingException;
6-
import org.codehaus.jackson.map.ObjectMapper;
7-
import org.codehaus.jackson.type.TypeReference;
88

99
import java.io.IOException;
1010
import java.util.ArrayList;

‎src/main/java/com/ldbc/driver/workloads/ldbc/snb/interactive/LdbcQuery13.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.ldbc.driver.workloads.ldbc.snb.interactive;
22

3+
import com.fasterxml.jackson.core.type.TypeReference;
4+
import com.fasterxml.jackson.databind.ObjectMapper;
35
import com.google.common.collect.ImmutableMap;
46
import com.ldbc.driver.Operation;
57
import com.ldbc.driver.SerializingMarshallingException;
6-
import org.codehaus.jackson.map.ObjectMapper;
7-
import org.codehaus.jackson.type.TypeReference;
88

99
import java.io.IOException;
1010
import java.util.ArrayList;

‎src/main/java/com/ldbc/driver/workloads/ldbc/snb/interactive/LdbcQuery14.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.ldbc.driver.workloads.ldbc.snb.interactive;
22

3+
import com.fasterxml.jackson.core.type.TypeReference;
4+
import com.fasterxml.jackson.databind.ObjectMapper;
35
import com.google.common.base.Function;
46
import com.google.common.collect.ImmutableMap;
57
import com.google.common.collect.Iterables;
68
import com.ldbc.driver.Operation;
79
import com.ldbc.driver.SerializingMarshallingException;
8-
import org.codehaus.jackson.map.ObjectMapper;
9-
import org.codehaus.jackson.type.TypeReference;
1010

1111
import java.io.IOException;
1212
import java.util.ArrayList;

0 commit comments

Comments
 (0)