Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pxiuqin/janusgraph
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: JanusGraph/janusgraph
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
Loading
Showing 1,485 changed files with 79,411 additions and 31,186 deletions.
11 changes: 11 additions & 0 deletions .backportrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"repoOwner": "janusgraph",
"repoName": "janusgraph",
"targetBranchChoices": ["v1.1"],
"branchLabelMapping": {
"^backport/(.+)$": "$1"
},
"autoMerge": true,
"autoMergeMethod": "rebase",
"targetPRLabels": ["backport/skip"]
}
22 changes: 14 additions & 8 deletions codecov.yml → .codecov.yml
Original file line number Diff line number Diff line change
@@ -12,18 +12,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# Don't post a comment on pull requests.
comment: off
codecov:
notify:
wait_for_ci: yes

# Disable commit statuses
coverage:
status:
project: no
patch: no
changes: no
patch:
default:
threshold: 5
project:
default:
# allow test coverage to drop by 2%, assume that it's typically due to CI problems
threshold: 2

comment: false

# Ignore test files
ignore:
- "**/test/.*"
- "**/test/**"
- "janusgraph-backend-testutils/**"
- "janusgraph-test/**"

31 changes: 31 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright 2020 JanusGraph Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# https://editorconfig.org

root = true
@@ -6,3 +20,20 @@ root = true
charset = utf-8
indent_style = space
indent_size = 4

[*.{yaml,yml}]
indent_size = 2

[*.xml]
insert_final_newline = false

[*.proto]
insert_final_newline = true

[*.java]
insert_final_newline = true
ij_java_use_single_class_imports = true
ij_java_class_count_to_use_import_on_demand = 1000
ij_java_names_count_to_use_import_on_demand = 1000
ij_java_imports_layout = *,|,java.**,javax.**,|,$*
ij_java_layout_static_imports_separately = true
17 changes: 17 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Copyright 2021 JanusGraph Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# These are supported funding model platforms

custom: ['https://crowdfunding.lfx.linuxfoundation.org/projects/janusgraph']
29 changes: 19 additions & 10 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,34 @@
---
name: Bug
about: "Report confirmed bugs. For unconfirmed bugs, please visit our mailing list https://groups.google.com/forum/#!forum/janusgraph-users"
about: "Report confirmed bugs. For unconfirmed bugs, please visit our mailing list https://lists.lfaidata.foundation/g/janusgraph-users/topics"
labels: "kind/bug/possible"

---

Please post all questions and issues on [janusgraph-users](https://groups.google.com/forum/#!forum/janusgraph-users)
<!--
Please post all questions and issues on [janusgraph-users](https://lists.lfaidata.foundation/g/janusgraph-users/topics)
before opening a GitHub issue. Your questions will reach a wider audience there,
and if we confirm that there is a bug, then you can open a new issue.
and if we confirm that there is a bug, then you can open a new issue. You could also use
[GitHub Discussions](https://github.com/JanusGraph/janusgraph/discussions/categories/q-a) or
[Discord](https://discord.gg/5n4fjv4QAf).
Reminder, check your current version and please update to a supported version of JanusGraph,
see https://docs.janusgraph.org/changelog/#currently-supported.
-->

Please include configurations and logs if available.

For confirmed bugs, please report:
- Version:
- Storage Backend:
- Mixed Index Backend:
- Mailing list Thread URL:
- Steps to Reproduce:

- Version: <!-- e.g.: 0.5.0, 0.6.0 -->
- Storage Backend: <!-- e.g.: cql, hbase, inmemory -->
- Mixed Index Backend: <!-- e.g.: elasticsearch, none -->
- Link to discussed bug: <!--GitHub Discussions, Discord, Mailing list or StackOverflow-->
- Expected Behavior:
- Current Behavior:
- Steps to Reproduce:

### Stack Trace (if you have one)

```
paste stack trace here
```
```
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Copyright 2021 JanusGraph Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

blank_issues_enabled: false
contact_links:
- name: Question?
url: https://github.com/JanusGraph/janusgraph/discussions
about: Who, what, when, where, and how? Use GitHub discussions.
- name: Issue with JanusGraph Docker image
url: https://github.com/JanusGraph/janusgraph-docker/issues/new
about: Please open issues relating to Docker Image in janusgraph-docker.
- name: Issue with JanusGraph FoundationDB Adapter
url: https://github.com/JanusGraph/janusgraph-foundationdb/issues/new
about: Please open issues relating to FoundationDB Adapter in janusgraph-foundationdb.
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@ name: Feature request
about: JanusGraph can't do all the things, but maybe it can do your things.

---

For discussion on internal implementation details of JanusGraph or proposing a [major new feature or subproject](https://docs.janusgraph.org/development/#development-decisions) use the [janusgraph-dev](https://groups.google.com/forum/#!forum/janusgraph-dev).

<!--
For discussion on internal implementation details of JanusGraph or proposing a [major new feature or subproject](https://docs.janusgraph.org/development/#development-decisions) use the [janusgraph-dev](https://lists.lfaidata.foundation/g/janusgraph-dev/topics) or [GitHub Discussions](https://github.com/JanusGraph/janusgraph/discussions/categories/ideas).
-->
**Describe the feature:**
TODO
[Please add a description for your feature.]

**Describe a specific use case for the feature:**
TODO
[If possible add a description of the specific use case.]
9 changes: 5 additions & 4 deletions .github/ISSUE_TEMPLATE/flaky-test.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
---
name: Flaky Test
about: Report a flaky test (one that doesn't pass consistently)
labels: "testing/flaky"

---

## Flaky Test

* **Test Name:** Name of the failing test.
* **Link:** Link to file/line number in GitHub.
* **Branch:** Git branch the test was seen in. If a PR, the branch the PR was based off.
* **Notes:** Additional details about the test, e.g., theory as to failure cause
* **Test Name:** <!--Name of the failing test.-->
* **Link:** <!--Link to file/line number in GitHub.-->
* **Branch:** <!--Git branch the test was seen in. If a PR, the branch the PR was based off.-->
* **Notes:** <!--Additional details about the test, e.g., theory as to failure cause-->

### Stack Trace

23 changes: 0 additions & 23 deletions .github/ISSUE_TEMPLATE/question.md

This file was deleted.

7 changes: 0 additions & 7 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -19,10 +19,3 @@ to ensure the following steps have been taken:

### For documentation related changes:
- [ ] Have you ensured that format looks appropriate for the output in which it is rendered?
- [ ] If this PR is a documentation-only change, have you added a `[doc only]`
tag to the first line of your commit message to avoid spending CPU cycles in
Travis CI when no code, tests, or build configuration are modified?

### Note:
Please ensure that once the PR is submitted, you check Travis CI for build issues and submit an update to your PR as soon as possible.

26 changes: 26 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
version: 2
updates:
- package-ecosystem: maven
directory: "/"
schedule:
interval: daily
time: "11:00"
open-pull-requests-limit: 10
groups:
junit:
patterns:
- "org.junit.*"
labels:
- "backport/v1.1"
- "dependencies"
- "java"

- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
time: "11:00"
open-pull-requests-limit: 10
labels:
- "backport/v1.1"
- "dependencies"
44 changes: 44 additions & 0 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Copyright 2022 JanusGraph Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

on:
pull_request_target:
types: ["labeled", "closed"]

jobs:
backport:
name: Backport PR
runs-on: ubuntu-latest
if: |
github.event.pull_request.merged == true
&& !contains(github.event.pull_request.labels.*.name, 'backport/skip')
&& (
(github.event.action == 'labeled' && startsWith(github.event.label.name, 'backport/'))
|| (github.event.action == 'closed')
)
steps:
- name: Backport Action
uses: sqren/backport-github-action@v9.5.1
with:
github_token: ${{ secrets.ACCESS_TOKEN }}
auto_backport_label_prefix: backport/
add_original_reviewers: true

- name: Info log
if: ${{ success() }}
run: cat ~/.backport/backport.info.log

- name: Debug log
if: ${{ failure() }}
run: cat ~/.backport/backport.debug.log
Loading