Skip to content

Commit 1ee50e3

Browse files
mayelenamayelena
committed
Merge branch 'master' into bugfix-branch
2 parents d9fefb4 + e6a24fc commit 1ee50e3

File tree

47 files changed

+963
-598
lines changed

Some content is hidden

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

47 files changed

+963
-598
lines changed

.travis.yml renamed to .github/outdated/.travis.yml

File renamed without changes.

APACHE_PROPOSAL.md renamed to .github/outdated/APACHE_PROPOSAL.md

File renamed without changes.

.github/workflows/cla.yml renamed to .github/outdated/cla.yml

File renamed without changes.

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,17 @@ jobs:
5656
run: |
5757
$TRAVIS_DIR/install-backend.sh $BACKEND
5858
59-
- name: Init MySQL Env
60-
if: ${{ env.BACKEND == 'mysql' }}
61-
uses: mirromutth/[email protected]
62-
with:
63-
host port: 3306 # Optional, default value is 3306. The port of host
64-
container port: 3306 # Optional, default value is 3306. The port of container
65-
character set server: 'utf8mb4' # Optional, default value is 'utf8mb4'. The '--character-set-server' option for mysqld
66-
collation server: 'utf8mb4_general_ci' # Optional, default value is 'utf8mb4_general_ci'. The '--collation-server' option for mysqld
67-
mysql version: '5.7' # Optional, default value is "latest". The version of the MySQL
68-
mysql database: 'test' # Optional, default value is "test". The specified database which will be create
69-
mysql root password: "******" # Required if "mysql user" is empty, default is empty. The root superuser password
70-
#mysql user: 'root' # Required if "mysql root password" is empty, default is empty. The superuser for the specified database. Can use secrets, too
71-
#mysql password: ${{ secrets.DatabasePassword }} # Required if "mysql user" exists. The password for the "mysql user"
59+
# - name: Init MySQL Env
60+
# if: ${{ env.BACKEND == 'mysql' }}
61+
# uses: mirromutth/[email protected]
62+
# with:
63+
# host port: 3306 # Optional, default value is 3306. The port of host
64+
# container port: 3306 # Optional, default value is 3306. The port of container
65+
# character set server: 'utf8mb4' # Optional, default value is 'utf8mb4'. The '--character-set-server' option for mysqld
66+
# collation server: 'utf8mb4_general_ci' # Optional, default value is 'utf8mb4_general_ci'. The '--collation-server' option for mysqld
67+
# mysql version: '5.7' # Optional, default value is "latest". The version of the MySQL
68+
# mysql database: 'test' # Optional, default value is "test". The specified database which will be create
69+
# mysql root password: "******" # Required if "mysql user" is empty, default is empty. The root superuser password
7270

7371
- name: Run unit test
7472
run: |
@@ -93,6 +91,6 @@ jobs:
9391
$TRAVIS_DIR/run-tinkerpop-test.sh $BACKEND tinkerpop
9492
9593
- name: Upload coverage to Codecov
96-
uses: codecov/codecov-action@v1
94+
uses: codecov/codecov-action@v3.0.0
9795
with:
9896
file: ${{ env.REPORT_DIR }}/*.xml

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ HugeGraph is a fast-speed and highly-scalable [graph database](https://en.wikipe
2626

2727
The project [homepage](https://hugegraph.github.io/hugegraph-doc/) contains more information on HugeGraph and provides links to **documentation**, getting-started guides and release downloads.
2828

29+
And here are links of other repositories:
30+
1. [hugegraph-toolchain](https://github.com/apache/incubator-hugegraph-toolchain) (include loader/dashboard/tool/client)
31+
2. [hugegraph-computer](https://github.com/apache/incubator-hugegraph-computer) (graph computing system)
32+
3. [hugegraph-commons](https://github.com/apache/incubator-hugegraph-commons) (include common & rpc module)
33+
4. [hugegraph-website](https://github.com/apache/incubator-hugegraph-doc) (include doc & website code)
34+
2935
## Contributing
3036

3137
Welcome to contribute to HugeGraph, please see [`How to Contribute`](CONTRIBUTING.md) for more information.

‎hugegraph-api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>hugegraph</artifactId>
77
<groupId>com.baidu.hugegraph</groupId>
8-
<version>0.12.0</version>
8+
<version>0.13.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎hugegraph-api/src/main/java/com/baidu/hugegraph/version/ApiVersion.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,6 @@ public final class ApiVersion {
125125

126126
public static void check() {
127127
// Check version of hugegraph-core. Firstly do check from version 0.3
128-
VersionUtil.check(CoreVersion.VERSION, "0.12", "0.13", CoreVersion.NAME);
128+
VersionUtil.check(CoreVersion.VERSION, "0.13", "0.14", CoreVersion.NAME);
129129
}
130130
}

‎hugegraph-cassandra/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>hugegraph</artifactId>
77
<groupId>com.baidu.hugegraph</groupId>
8-
<version>0.12.0</version>
8+
<version>0.13.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraMetrics.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import java.io.IOException;
2323
import java.lang.management.MemoryUsage;
24+
import java.net.InetAddress;
2425
import java.util.Collections;
2526
import java.util.List;
2627
import java.util.Map;
@@ -32,6 +33,7 @@
3233
import org.apache.cassandra.tools.NodeProbe;
3334
import org.apache.cassandra.tools.nodetool.Compact;
3435
import org.apache.tinkerpop.gremlin.util.NumberHelper;
36+
import org.slf4j.Logger;
3537

3638
import com.baidu.hugegraph.backend.store.BackendMetrics;
3739
import com.baidu.hugegraph.backend.store.BackendTable;
@@ -42,13 +44,16 @@
4244
import com.baidu.hugegraph.testutil.Whitebox;
4345
import com.baidu.hugegraph.util.E;
4446
import com.baidu.hugegraph.util.InsertionOrderUtil;
47+
import com.baidu.hugegraph.util.Log;
4548
import com.baidu.hugegraph.util.UnitUtil;
4649
import com.datastax.driver.core.Cluster;
4750
import com.datastax.driver.core.Host;
4851
import com.google.common.collect.ImmutableList;
4952

5053
public class CassandraMetrics implements BackendMetrics {
5154

55+
private static final Logger LOG = Log.logger(CassandraMetrics.class);
56+
5257
private final Cluster cluster;
5358
private final int port;
5459
private final String username;
@@ -139,6 +144,7 @@ protected Map<String, Object> getMetricsByHost(String host) {
139144
* probe.takeSnapshot(snapshotName, table, options, keyspaces)
140145
*/
141146
} catch (Throwable e) {
147+
LOG.debug("Unable to get metrics from host '{}':", host, e);
142148
metrics.put(EXCEPTION, e.toString());
143149
}
144150
return metrics;
@@ -290,15 +296,17 @@ private Map<String, Object> executeAllHosts(Function<String, Object> func) {
290296

291297
Map<String, Object> hostsResults = InsertionOrderUtil.newMap();
292298
for (Host host : hosts) {
293-
String address = host.getAddress().getHostAddress();
294-
hostsResults.put(address, func.apply(address));
299+
InetAddress address = host.getAddress();
300+
String hostAddress = address.getHostAddress();
301+
hostsResults.put(hostAddress, func.apply(hostAddress));
295302
}
296303
results.put(SERVERS, hostsResults);
297304

298305
return results;
299306
}
300307

301308
private NodeProbe newNodeProbe(String host) throws IOException {
309+
LOG.debug("Probe to cassandra node: '{}:{}'", host, this.port);
302310
return this.username.isEmpty() ?
303311
new NodeProbe(host, this.port) :
304312
new NodeProbe(host, this.port, this.username, this.password);

‎hugegraph-core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.baidu.hugegraph</groupId>
77
<artifactId>hugegraph</artifactId>
8-
<version>0.12.0</version>
8+
<version>0.13.0</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<artifactId>hugegraph-core</artifactId>
@@ -243,7 +243,7 @@
243243
</addDefaultSpecificationEntries>
244244
</manifest>
245245
<manifestEntries>
246-
<Implementation-Version>0.12.0.0</Implementation-Version>
246+
<Implementation-Version>0.13.0.0</Implementation-Version>
247247
</manifestEntries>
248248
</archive>
249249
</configuration>

0 commit comments

Comments
 (0)