Add nodes and data size to extra param (#44)
diff --git a/pom.xml b/pom.xml
index 7f639e5..27809ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>com.baidu.hugegraph</groupId>
<artifactId>hugegraph-common</artifactId>
- <version>1.7.2</version>
+ <version>1.7.3</version>
<name>hugegraph-common</name>
<url>https://github.com/hugegraph/hugegraph-common</url>
@@ -218,7 +218,7 @@
<manifestEntries>
<!-- Must be on one line, otherwise the automatic
upgrade script cannot replace the version number -->
- <Implementation-Version>1.7.2.0</Implementation-Version>
+ <Implementation-Version>1.7.3.0</Implementation-Version>
</manifestEntries>
</archive>
</configuration>
diff --git a/src/main/java/com/baidu/hugegraph/license/ExtraParam.java b/src/main/java/com/baidu/hugegraph/license/ExtraParam.java
index 43f6d05..ebd2f94 100644
--- a/src/main/java/com/baidu/hugegraph/license/ExtraParam.java
+++ b/src/main/java/com/baidu/hugegraph/license/ExtraParam.java
@@ -41,15 +41,30 @@
@JsonProperty("cpus")
private int cpus;
+ // The unit is MB
@JsonProperty("ram")
private int ram;
@JsonProperty("threads")
private int threads;
+ // The unit is MB
@JsonProperty("memory")
private int memory;
+ @JsonProperty("nodes")
+ private int nodes;
+
+ // The unit is MB
+ @JsonProperty("data_size")
+ private long dataSize;
+
+ @JsonProperty("vertices")
+ private long vertices;
+
+ @JsonProperty("edges")
+ private long edges;
+
public String id() {
return this.id;
}
@@ -85,4 +100,20 @@
public int memory() {
return this.memory;
}
+
+ public int nodes() {
+ return this.nodes;
+ }
+
+ public long dataSize() {
+ return this.dataSize;
+ }
+
+ public long vertices() {
+ return this.vertices;
+ }
+
+ public long edges() {
+ return this.edges;
+ }
}
diff --git a/src/main/java/com/baidu/hugegraph/version/CommonVersion.java b/src/main/java/com/baidu/hugegraph/version/CommonVersion.java
index 5c4ed4b..29487b9 100644
--- a/src/main/java/com/baidu/hugegraph/version/CommonVersion.java
+++ b/src/main/java/com/baidu/hugegraph/version/CommonVersion.java
@@ -27,5 +27,5 @@
// The second parameter of Version.of() is for all-in-one JAR
public static final Version VERSION = Version.of(CommonVersion.class,
- "1.7.2");
+ "1.7.3");
}
diff --git a/src/test/java/com/baidu/hugegraph/unit/license/ExtraParamTest.java b/src/test/java/com/baidu/hugegraph/unit/license/ExtraParamTest.java
index 0e0cc22..9655019 100644
--- a/src/test/java/com/baidu/hugegraph/unit/license/ExtraParamTest.java
+++ b/src/test/java/com/baidu/hugegraph/unit/license/ExtraParamTest.java
@@ -40,7 +40,11 @@
+ "\"cpus\":32,"
+ "\"ram\":65536,"
+ "\"threads\":96,"
- + "\"memory\":32768"
+ + "\"memory\":32768,"
+ + "\"nodes\":3,"
+ + "\"data_size\":1024,"
+ + "\"vertices\":1000,"
+ + "\"edges\":2000"
+ "}";
ObjectMapper mapper = new ObjectMapper();
ExtraParam param = mapper.readValue(json, ExtraParam.class);
@@ -53,5 +57,9 @@
Assert.assertEquals(65536, param.ram());
Assert.assertEquals(96, param.threads());
Assert.assertEquals(32768, param.memory());
+ Assert.assertEquals(3, param.nodes());
+ Assert.assertEquals(1024, param.dataSize());
+ Assert.assertEquals(1000, param.vertices());
+ Assert.assertEquals(2000, param.edges());
}
}
diff --git a/src/test/java/com/baidu/hugegraph/unit/license/LicenseCreateParamTest.java b/src/test/java/com/baidu/hugegraph/unit/license/LicenseCreateParamTest.java
index cc9ddaa..7000cb5 100644
--- a/src/test/java/com/baidu/hugegraph/unit/license/LicenseCreateParamTest.java
+++ b/src/test/java/com/baidu/hugegraph/unit/license/LicenseCreateParamTest.java
@@ -59,7 +59,11 @@
+ "\"cpus\":32,"
+ "\"ram\":65536,"
+ "\"threads\":96,"
- + "\"memory\":32768"
+ + "\"memory\":32768,"
+ + "\"nodes\":3,"
+ + "\"data_size\":1024,"
+ + "\"vertices\":1000,"
+ + "\"edges\":2000"
+ "},"
+ "{"
+ "\"id\":\"server-2\","
@@ -70,7 +74,11 @@
+ "\"cpus\":64,"
+ "\"ram\":65536,"
+ "\"threads\":96,"
- + "\"memory\":65536"
+ + "\"memory\":65536,"
+ + "\"nodes\":30,"
+ + "\"data_size\":10240,"
+ + "\"vertices\":10000,"
+ + "\"edges\":20000"
+ "}"
+ "]"
+ "}";
