Skip to content
This repository has been archived by the owner on Aug 30, 2023. It is now read-only.

Bump commons-lang3 from 3.11 to 3.12.0 #17

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions .github/workflows/ci-mapped.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# 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.

name: Publish package to GitHub Packages
on:
release:
types: [created]
jobs:
publish:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
with:
java-version: '8'
distribution: 'adopt'

- name: Setup unique version
run: mvn versions:set -DnewVersion=$(date +%s) -DgenerateBackupPoms=false

- name: Compile and prepare release
run: mvn clean install -Pjanusgraph-release -Dgpg.skip=true -DskipTests=true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Deploy release
run: mvn deploy -Pjanusgraph-release -Dgpg.skip=true -DskipTests=true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions docs/configs/janusgraph-cfg.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ Configuration options that modify JanusGraph's caching behavior
| Name | Description | Datatype | Default Value | Mutability |
| ---- | ---- | ---- | ---- | ---- |
| cache.db-cache | Whether to enable JanusGraph's database-level cache, which is shared across all transactions. Enabling this option speeds up traversals by holding hot graph elements in memory, but also increases the likelihood of reading stale data. Disabling it forces each transaction to independently fetch graph elements from storage before reading/writing them. | Boolean | false | MASKABLE |
| cache.db-cache-clean-wait | How long, in milliseconds, database-level cache will keep entries after flushing them. This option is only useful on distributed storage backends that are capable of acknowledging writes without necessarily making them immediately visible. | Integer | 50 | GLOBAL_OFFLINE |
| cache.db-cache-clean-wait | How long, in milliseconds, database-level cache will keep entries after flushing them. This option is only useful on distributed storage backends that are capable of acknowledging writes without necessarily making them immediately visible. | Integer | 50 | MASKABLE |
| cache.db-cache-size | Size of JanusGraph's database level cache. Values between 0 and 1 are interpreted as a percentage of VM heap, while larger values are interpreted as an absolute size in bytes. | Double | 0.3 | MASKABLE |
| cache.db-cache-time | Default expiration time, in milliseconds, for entries in the database-level cache. Entries are evicted when they reach this age even if the cache has room to spare. Set to 0 to disable expiration (cache entries live forever or until memory pressure triggers eviction when set to 0). | Long | 10000 | GLOBAL_OFFLINE |
| cache.db-cache-time | Default expiration time, in milliseconds, for entries in the database-level cache. Entries are evicted when they reach this age even if the cache has room to spare. Set to 0 to disable expiration (cache entries live forever or until memory pressure triggers eviction when set to 0). | Long | 10000 | MASKABLE |
| cache.tx-cache-size | Maximum size of the transaction-level cache of recently-used vertices. | Integer | 20000 | MASKABLE |
| cache.tx-dirty-size | Initial size of the transaction-level cache of uncommitted dirty vertices. This is a performance hint for write-heavy, performance-sensitive transactional workloads. If set, it should roughly match the median vertices modified per transaction. | Integer | (no default value) | MASKABLE |

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public void testReadOperations(boolean cache) {
mgmt.setConsistency(mgmt.getGraphIndex("uid"),ConsistencyModifier.LOCK);
finishSchema();

if (cache) clopen(option(DB_CACHE),true,option(DB_CACHE_CLEAN_WAIT),0,option(DB_CACHE_TIME),0);
if (cache) clopen(option(DB_CACHE),true,option(DB_CACHE_CLEAN_WAIT),0,option(DB_CACHE_TIME),0L);
else clopen();

JanusGraphTransaction tx = graph.buildTransaction().groupName(metricsPrefix).start();
Expand Down Expand Up @@ -483,7 +483,7 @@ public void printAllMetrics(String prefix) {
public void testCacheConcurrency() throws InterruptedException {
metricsPrefix = "tCC";
Object[] newConfig = {option(GraphDatabaseConfiguration.DB_CACHE),true,
option(GraphDatabaseConfiguration.DB_CACHE_TIME),0,
option(GraphDatabaseConfiguration.DB_CACHE_TIME),0L,
option(GraphDatabaseConfiguration.DB_CACHE_CLEAN_WAIT),0,
option(GraphDatabaseConfiguration.DB_CACHE_SIZE),0.25,
option(GraphDatabaseConfiguration.BASIC_METRICS),true,
Expand Down Expand Up @@ -595,7 +595,7 @@ protected void resetMetrics() {
@Test
public void testCacheSpeedup() {
Object[] newConfig = {option(GraphDatabaseConfiguration.DB_CACHE),true,
option(GraphDatabaseConfiguration.DB_CACHE_TIME),0};
option(GraphDatabaseConfiguration.DB_CACHE_TIME),0L};
clopen(newConfig);

int numV = 1000;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@
import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.CUSTOM_ATTRIBUTE_CLASS;
import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.CUSTOM_SERIALIZER_CLASS;
import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.DB_CACHE;
import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.DB_CACHE_TIME;
import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.FORCE_INDEX_USAGE;
import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.HARD_MAX_LIMIT;
import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.IDS_STORE_NAME;
import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.INITIAL_JANUSGRAPH_VERSION;
import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.LIMIT_BATCH_SIZE;
import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.LOG_BACKEND;
Expand Down Expand Up @@ -2740,7 +2740,7 @@ public void testGlobalGraphConfig() {

@Test
public void testGlobalOfflineGraphConfig() {
setAndCheckGraphOption(DB_CACHE_TIME, ConfigOption.Type.GLOBAL_OFFLINE, 500L, 777L);
setAndCheckGraphOption(IDS_STORE_NAME, ConfigOption.Type.GLOBAL_OFFLINE, "testIdsStoreName", "testIdsStoreName2");
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ public boolean apply(@Nullable String s) {
"How long, in milliseconds, database-level cache will keep entries after flushing them. " +
"This option is only useful on distributed storage backends that are capable of acknowledging writes " +
"without necessarily making them immediately visible.",
ConfigOption.Type.GLOBAL_OFFLINE, 50);
ConfigOption.Type.MASKABLE, 50);

/**
* The default expiration time for elements held in the database level cache. This is the time period before
Expand All @@ -389,7 +389,7 @@ public boolean apply(@Nullable String s) {
"Entries are evicted when they reach this age even if the cache has room to spare. " +
"Set to 0 to disable expiration (cache entries live forever or until memory pressure " +
"triggers eviction when set to 0).",
ConfigOption.Type.GLOBAL_OFFLINE, 10000L);
ConfigOption.Type.MASKABLE, 10000L);

/**
* Configures the maximum number of recently-used vertices cached by a transaction. The smaller the cache size, the
Expand Down
12 changes: 7 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,14 @@
</scm>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<id>github</id>
<name>GitHub Packages</name>
<url>https://maven.pkg.github.com/mapped/janusgraph</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<id>github</id>
<name>GitHub Packages</name>
<url>https://maven.pkg.github.com/mapped/janusgraph</url>
</repository>
</distributionManagement>
<properties>
Expand Down Expand Up @@ -674,7 +676,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.11</version>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
Expand Down