From 4ee38fa79bcdd6b2669d8d4e28f40c9b1714ce2a Mon Sep 17 00:00:00 2001 From: Linary Date: Wed, 18 Sep 2019 21:44:08 +0800 Subject: [PATCH] Relax restrictions on minimum memory (#689) Improve #682 Change-Id: I92ae91b0ab5076566fcbbe10d4d48122ffd9dde5 --- .../hugegraph/api/filter/LoadDetectFilter.java | 3 --- .../baidu/hugegraph/config/ServerOptions.java | 18 +++++++++--------- .../com/baidu/hugegraph/core/GraphManager.java | 2 +- .../backend/tx/GraphIndexTransaction.java | 4 ++-- .../hugegraph/structure/HugeFeatures.java | 2 +- .../optimize/HugeScriptTraversal.java | 2 +- .../backend/store/palo/PaloSessions.java | 2 +- .../unit/serializer/BytesBufferTest.java | 4 ++-- 8 files changed, 17 insertions(+), 20 deletions(-) diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/LoadDetectFilter.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/LoadDetectFilter.java index feaa97d63..d52cf1237 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/LoadDetectFilter.java +++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/filter/LoadDetectFilter.java @@ -34,7 +34,6 @@ import javax.ws.rs.ext.Provider; import com.baidu.hugegraph.config.HugeConfig; import com.baidu.hugegraph.config.ServerOptions; import com.baidu.hugegraph.define.WorkLoad; -import com.baidu.hugegraph.license.LicenseVerifier; import com.baidu.hugegraph.util.Bytes; import com.baidu.hugegraph.util.E; import com.google.common.collect.ImmutableSet; @@ -63,8 +62,6 @@ public class LoadDetectFilter implements ContainerRequestFilter { @Override public void filter(ContainerRequestContext context) { - LicenseVerifier.instance().verifyIfNeeded(); - if (LoadDetectFilter.isWhiteAPI(context)) { return; } diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java index 9c5c15bc8..00b69229d 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java +++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java @@ -70,19 +70,19 @@ public class ServerOptions extends OptionHolder { "The minmium free memory(MB) of rest server, requests " + "will be rejected when the available memory of system " + "is lower than this value.", - positiveInt(), - 256 + nonNegativeInt(), + 64 ); public static final ConfigOption REQUEST_TIMEOUT = - new ConfigOption<>( - "restserver.request_timeout", - "The time in seconds within which a request must complete, " + - "-1 means no timeout.", - rangeInt(-1, Integer.MAX_VALUE), - 30 - ); + new ConfigOption<>( + "restserver.request_timeout", + "The time in seconds within which a request must complete, " + + "-1 means no timeout.", + rangeInt(-1, Integer.MAX_VALUE), + 30 + ); public static final ConfigOption CONN_IDLE_TIMEOUT = new ConfigOption<>( diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java index 351690321..57d6ffa4e 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java +++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java @@ -72,7 +72,7 @@ public final class GraphManager { } this.loadGraphs(conf.getMap(ServerOptions.GRAPHS)); - this.installLicense(conf); + // this.installLicense(conf); this.checkBackendVersionOrExit(); this.restoreUncompletedTasks(); this.addMetrics(conf); diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java index 06df9754f..1527dc40e 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java @@ -591,7 +591,7 @@ public class GraphIndexTransaction extends AbstractTransaction { ConditionQuery query) { SchemaTransaction schema = this.graph().schemaTransaction(); Set ils = InsertionOrderUtil.newSet(); - for(Id il : schemaLabel.indexLabels()) { + for (Id il : schemaLabel.indexLabels()) { ils.add(schema.getIndexLabel(il)); } if (ils.isEmpty()) { @@ -753,7 +753,7 @@ public class GraphIndexTransaction extends AbstractTransaction { } } // Must match all fields - if(indexFields.equals(queryPropKeys)) { + if (indexFields.equals(queryPropKeys)) { return matchedIndexLabels; } else { return ImmutableSet.of(); diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeFeatures.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeFeatures.java index de4cc67f0..9c26cb83b 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeFeatures.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeFeatures.java @@ -149,7 +149,7 @@ public class HugeFeatures implements Graph.Features { @Override public boolean willAllowId(Object id) { - if(!this.supportsUserSuppliedIds()) { + if (!this.supportsUserSuppliedIds()) { return false; } else { return this.supportsAnyIds() || diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeScriptTraversal.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeScriptTraversal.java index 0bd0653c8..2aed83044 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeScriptTraversal.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/HugeScriptTraversal.java @@ -83,7 +83,7 @@ public final class HugeScriptTraversal extends DefaultTraversal { .withStrategies(strategies)); bindings.put("graph", this.graph); - for(Map.Entry entry : this.aliases.entrySet()) { + for (Map.Entry entry : this.aliases.entrySet()) { Object value = bindings.get(entry.getValue()); if (value == null) { throw new IllegalArgumentException(String.format( diff --git a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloSessions.java b/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloSessions.java index 58454c6b1..7aa8b7e71 100644 --- a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloSessions.java +++ b/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloSessions.java @@ -306,7 +306,7 @@ public class PaloSessions extends MysqlSessions { Lock lock = PaloSessions.this.locks.get(sessionId).writeLock(); lock.lock(); try { - String table = file.table();; + String table = file.table(); String data = file.readAsString(); String label = this.formatLabel(table); this.client.bulkLoadAsync(table, data, label); diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BytesBufferTest.java b/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BytesBufferTest.java index 2d0ad9d19..1e61dfe4f 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BytesBufferTest.java +++ b/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/BytesBufferTest.java @@ -786,7 +786,7 @@ public class BytesBufferTest extends BaseUnitTest { Assert.assertEquals(value, BytesBuffer.wrap(bytes).readProperty(pkey)); pkey = genListPkey(DataType.INT); - value = ImmutableList.of(127, 128);; + value = ImmutableList.of(127, 128); bytes = genBytes("027f8100"); buf.flip(); Assert.assertArrayEquals(bytes, buf.writeProperty(pkey, value).bytes()); @@ -890,7 +890,7 @@ public class BytesBufferTest extends BaseUnitTest { Assert.assertEquals(value, BytesBuffer.wrap(bytes).readProperty(pkey)); pkey = genSetPkey(DataType.INT); - value = ImmutableSet.of(127, 128);; + value = ImmutableSet.of(127, 128); bytes = genBytes("027f8100"); buf.flip(); Assert.assertArrayEquals(bytes, buf.writeProperty(pkey, value).bytes());