Skip to content

Commit 90f658e

Browse files
authored
Merge pull request #95 from ldbc/dev
Update BI query and results classes
2 parents a25bfcc + 330871b commit 90f658e

File tree

177 files changed

+3512
-2477
lines changed

Some content is hidden

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

177 files changed

+3512
-2477
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ plotting/*.pdf
1111
.idea/
1212
*.swp
1313
results/
14+
mvn.log

.travis.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
dist: trusty
2-
sudo: required
31
language: java
42
install: true
53
script:
6-
- mvn test | grep "^\\["
4+
# the total output is approx. 50k lines, so we need to filter it a bit
5+
- mvn test | grep '^\[\|^ExecuteWorkloadMode' | tee mvn.log
6+
# test if the output of the mvn command contained an "[INFO] BUILD SUCCESS" entry
7+
- grep 'BUILD SUCCESS' mvn.log
78
notifications:
89
slack: ldbcouncil:0FIBC03v0bz1jQqtoYsLRE1h
910
email: false

dependency-reduced-pom.xml

+13
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,26 @@
3939
</plugin>
4040
<plugin>
4141
<artifactId>maven-surefire-plugin</artifactId>
42+
<version>2.18.1</version>
4243
<configuration>
4344
<forkCount>1</forkCount>
4445
<reuseForks>true</reuseForks>
4546
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
4647
<printSummary>false</printSummary>
4748
</configuration>
4849
</plugin>
50+
<plugin>
51+
<artifactId>maven-source-plugin</artifactId>
52+
<version>3.0.1</version>
53+
<executions>
54+
<execution>
55+
<id>attach-sources</id>
56+
<goals>
57+
<goal>jar</goal>
58+
</goals>
59+
</execution>
60+
</executions>
61+
</plugin>
4962
</plugins>
5063
</build>
5164
<repositories>

pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,28 @@
155155
<plugin>
156156
<groupId>org.apache.maven.plugins</groupId>
157157
<artifactId>maven-surefire-plugin</artifactId>
158+
<version>2.18.1</version>
158159
<configuration>
159160
<forkCount>1</forkCount>
160161
<reuseForks>true</reuseForks>
161162
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
162163
<printSummary>false</printSummary>
163164
</configuration>
164165
</plugin>
166+
167+
<plugin>
168+
<groupId>org.apache.maven.plugins</groupId>
169+
<artifactId>maven-source-plugin</artifactId>
170+
<version>3.0.1</version>
171+
<executions>
172+
<execution>
173+
<id>attach-sources</id>
174+
<goals>
175+
<goal>jar</goal>
176+
</goals>
177+
</execution>
178+
</executions>
179+
</plugin>
165180
</plugins>
166181
</build>
167182
</project>

src/main/java/com/ldbc/driver/Operation.java

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import com.ldbc.driver.temporal.TemporalUtil;
44

5+
import java.util.Map;
6+
57
public abstract class Operation<RESULT_TYPE>
68
{
79
private static final TemporalUtil temporalutil = new TemporalUtil();
@@ -51,6 +53,8 @@ public String toString()
5153
'}';
5254
}
5355

56+
public abstract Map<String, Object> parameterMap();
57+
5458
public abstract RESULT_TYPE marshalResult( String serializedOperationResult )
5559
throws SerializingMarshallingException;
5660

0 commit comments

Comments
 (0)