repo stringlengths 5 53 | pr_number int32 1 321k | task_type stringclasses 2
values | issue_text stringlengths 0 81.2k | pr_title stringlengths 1 319 | pr_body stringlengths 0 105k | base_sha stringlengths 40 40 | head_sha stringlengths 40 40 | gold_diff stringlengths 0 202M | changed_files listlengths 0 100 | review_threads listlengths 0 100 | test_patch stringlengths 0 23.4M | merged bool 1
class |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
LAION-AI/Open-Assistant | 3,641 | issue_to_patch | Bump react-hook-form from 7.44.3 to 7.45.4 in /website | Bumps [react-hook-form](https://github.com/react-hook-form/react-hook-form) from 7.44.3 to 7.45.4.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/react-hook-form/react-hook-form/releases">react-hook-form's releases</a>.</em></p>
<blockquote>
<h2>Version 7.45.4</h2>
<p>🐞 fix ... | 0d4adb5f1ad6c38a828370414a584dd485165dce | 4238e054e90b57bbd827483266cf9a65f6a5a7f1 | diff --git a/website/package-lock.json b/website/package-lock.json
index cb672376fb..bbb6c3db79 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -53,7 +53,7 @@
"react-cookie": "^4.1.1",
"react-dom": "^18.2.0",
"react-feature-flags": "^1.0.0",
- "react-hook-form... | [
"website/package-lock.json",
"website/package.json"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,642 | issue_to_patch | Bump eslint from 8.41.0 to 8.46.0 in /website | Bumps [eslint](https://github.com/eslint/eslint) from 8.41.0 to 8.46.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/eslint/eslint/releases">eslint's releases</a>.</em></p>
<blockquote>
<h2>v8.46.0</h2>
<h2>Features</h2>
<ul>
<li><a href="https://github.com/eslint/eslint/co... | 0d4adb5f1ad6c38a828370414a584dd485165dce | aa6262e13297e0caea588c9c047e19daf6dcbd35 | diff --git a/website/package-lock.json b/website/package-lock.json
index cb672376fb..73da25558f 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -34,7 +34,7 @@
"chart.js": "^4.3.0",
"clsx": "^1.2.1",
"date-fns": "^2.30.0",
- "eslint": "^8.41.0",
+ "eslin... | [
"website/package-lock.json",
"website/package.json"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,618 | issue_to_patch | Add rope-scaling parameters to export_model.py | Add two new command line parameters which when present override the model's rope-scaling configuration:
`--rope_scaling_type`: linear, dynamic (default="linear")
`--rope_scaling_factor`: set rope scaling factor (float >1.0) | 7a68b591a12fa900ac58601ff5b77519c97aad97 | d9fa976410e3814ec27234105684e3b5627113c1 | diff --git a/model/model_training/tools/export_model.py b/model/model_training/tools/export_model.py
index d41d56fb6f..8ce456085e 100644
--- a/model/model_training/tools/export_model.py
+++ b/model/model_training/tools/export_model.py
@@ -17,6 +17,10 @@ def parse_args():
parser.add_argument("--cache_dir", type=str... | [
"model/model_training/tools/export_model.py"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,637 | issue_to_patch | Add paper acknowledgement form | I know all of this is suboptimal, but I'd like to get people to sign up to be mentioned asap. Feel free to improve (or to tell me how to improve) now or in subsequent PRs. I anticipate this form will be going away in the future, so I'm not sure a lot of work will be really worth it. | 0d4adb5f1ad6c38a828370414a584dd485165dce | 86848d75bcfc66045bd4991b4378659c311bd033 | diff --git a/website/prisma/migrations/20230805220637_paperack/migration.sql b/website/prisma/migrations/20230805220637_paperack/migration.sql
new file mode 100644
index 0000000000..848c306b20
--- /dev/null
+++ b/website/prisma/migrations/20230805220637_paperack/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE... | [
"website/prisma/migrations/20230805220637_paperack/migration.sql",
"website/prisma/schema.prisma",
"website/public/locales/en/account.json",
"website/src/pages/account/index.tsx",
"website/src/pages/account/paperack.tsx",
"website/src/pages/api/paperack.ts"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,638 | issue_to_patch | Added plugin repositories to add-plugin menu | For now I've added getit.ai as a repository, but we can easily add others, they're just a link for now | 0d4adb5f1ad6c38a828370414a584dd485165dce | 65299bc370132f66879bfe13279b754fa2a7cf46 | diff --git a/website/public/locales/en/chat.json b/website/public/locales/en/chat.json
index 0497cb1df6..3516b2dd87 100644
--- a/website/public/locales/en/chat.json
+++ b/website/public/locales/en/chat.json
@@ -33,6 +33,7 @@
"typical_p": "Typical p: Typical sampling is an information-theoretic technique that, in a... | [
"website/public/locales/en/chat.json",
"website/src/components/Chat/PluginsChooser.tsx"
] | [
{
"comment": "if you have a url for installing plugins you could use getitAI's callback mechanism: https://www.getit.ai/gpt-plugins/chat-integration",
"path": "website/src/components/Chat/PluginsChooser.tsx",
"hunk": "@@ -234,6 +236,16 @@ export const PluginsChooser = ({ plugins, setPlugins }: PluginsCh... | true | ||
LAION-AI/Open-Assistant | 3,643 | issue_to_patch | To support pip install for model_training package. | For the Python module: model_training, the original package management file pyproject.toml was configured with "py-modules = ["model_training"]". However, "py-modules" is typically used for setting up single file modules, not for Python packages. The original configuration could possibly cause "pip install ." to fail t... | 0d4adb5f1ad6c38a828370414a584dd485165dce | 0f6656cafbf20709ddbf08af89f1ef3e32745b62 | diff --git a/model/pyproject.toml b/model/pyproject.toml
index a0e9931ba0..d03a1d12a6 100644
--- a/model/pyproject.toml
+++ b/model/pyproject.toml
@@ -42,7 +42,7 @@ tests = [
]
[tool.setuptools]
-py-modules = ["model_training"]
+packages = ["model_training"]
[tool.black]
line-length = 120
| [
"model/pyproject.toml"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,644 | issue_to_patch | Revert "Cleanup `handle_worker()` in preparation for #2815 (Stop generation early) (#3573)" | This PR commit 0c2fa4ca33bbe5e734586e78eec2c0877cba2a92.
We'll investigate why this caused problems | 0d4adb5f1ad6c38a828370414a584dd485165dce | 24006f9edc33c736aa26ecf11fd1b83dd9584815 | diff --git a/inference/server/oasst_inference_server/routes/workers.py b/inference/server/oasst_inference_server/routes/workers.py
index 20195f9b2d..6562624967 100644
--- a/inference/server/oasst_inference_server/routes/workers.py
+++ b/inference/server/oasst_inference_server/routes/workers.py
@@ -1,7 +1,6 @@
import a... | [
"inference/server/oasst_inference_server/routes/workers.py",
"inference/server/oasst_inference_server/worker_utils.py"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,629 | issue_to_patch | Add Wikipedia Persian Dataset | Currently, the Open-assistant model doesn't support Farsi. This is a text-only dataset to learn Farsi (Persian).
One of my friends fine-tuned LLaMa on this dataset and It could understand Farsi grammar and word usage very well. If the Open-assistant team wants to add support to Farsi, this should be the first step.
... | aa96100629af2785e4cbf3c4ec009f2737fc0d3b | 7e438b3fd651664247a1c90ce95bc40f0371c1f1 | diff --git a/data/datasets/__init__.py b/data/datasets/__init__.py
index 6cf9e7f027..92a82179f0 100644
--- a/data/datasets/__init__.py
+++ b/data/datasets/__init__.py
@@ -4,6 +4,7 @@
"tv_dialogue": "sedthh/tv_dialogue", # TV and Movie dialogues and transcripts
"fd_dialogue": "sedthh/fd_dialogue", # TV and M... | [
"data/datasets/__init__.py",
"data/datasets/fa-wikipedia/README.md"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,612 | issue_to_patch | Changes for orcacode experiment | c2f444d0d85f81db2f9d35507831865b45d40d6c | a42b82dd5d63c26ffec5079912c292471c900614 | diff --git a/model/model_training/configs/config.yaml b/model/model_training/configs/config.yaml
index a7c1f70c5d..6b94a81c3d 100644
--- a/model/model_training/configs/config.yaml
+++ b/model/model_training/configs/config.yaml
@@ -847,3 +847,75 @@ falcon_7b_ntk_test:
alpha: 2
datasets:
- dolly15k
+
+llama2... | [
"model/model_training/configs/config.yaml",
"model/model_training/custom_datasets/__init__.py",
"model/model_training/custom_datasets/instruction.py",
"model/model_training/custom_datasets/prompt_dialogue.py",
"model/model_training/custom_datasets/qa_datasets.py",
"model/model_training/models/patching.py"... | [
{
"comment": "Isn't it better to add `data_files` as an argument with the default value \"flan-5m...\"? In this way, we can change to gpt-4 version using config if required. \r\n`",
"path": "model/model_training/custom_datasets/prompt_dialogue.py",
"hunk": "@@ -199,45 +198,37 @@ def __getitem__(self, i... | true | |||
LAION-AI/Open-Assistant | 3,616 | issue_to_patch | Added support for LLongMA | Added tokenizer for llongma | c2c1318694e35566473c69d4a9cc374a86cff12c | e3ceeae29439649b2f5a6bc68dee869cc30577c2 | diff --git a/model/model_training/utils/utils.py b/model/model_training/utils/utils.py
index e3c9098899..677da36a22 100644
--- a/model/model_training/utils/utils.py
+++ b/model/model_training/utils/utils.py
@@ -187,6 +187,7 @@ class TokenizerConfig(NamedTuple):
"falcon": TokenizerConfig(
special_tokens=Sp... | [
"model/model_training/utils/utils.py"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,631 | issue_to_patch | Add Isna Persian Dataset | The level of importance of this data is less than Wikipedia. So, I think [this pull request](https://github.com/LAION-AI/Open-Assistant/pull/3629) should be merged first.
I have uploaded the data to [huggingface](https://huggingface.co/datasets/pourmand1376/isna-news) according to Open-assistant's standard. So, it ... | 65f5c2bd9241024b1a1525275c2c23ff2cbd5138 | 4fc4943f5546fb974e12a0e4e071aeea154b9384 | diff --git a/data/datasets/__init__.py b/data/datasets/__init__.py
index 92a82179f0..7b2c077ea4 100644
--- a/data/datasets/__init__.py
+++ b/data/datasets/__init__.py
@@ -4,6 +4,7 @@
"tv_dialogue": "sedthh/tv_dialogue", # TV and Movie dialogues and transcripts
"fd_dialogue": "sedthh/fd_dialogue", # TV and M... | [
"data/datasets/__init__.py",
"data/datasets/fa-isna-news/README.md"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,619 | issue_to_patch | update ru-translation | As title says | 7a68b591a12fa900ac58601ff5b77519c97aad97 | 8ae06c03a8725f10120f9afe67fb1e163595bbb6 | diff --git a/website/public/locales/ru/account.json b/website/public/locales/ru/account.json
index af4d73283d..173e0c25af 100644
--- a/website/public/locales/ru/account.json
+++ b/website/public/locales/ru/account.json
@@ -4,6 +4,7 @@
"delete_account_intro": "Удаление аккаунта предполагает следующее:",
"delete_ac... | [
"website/public/locales/ru/account.json",
"website/public/locales/ru/chat.json",
"website/public/locales/ru/common.json",
"website/public/locales/ru/message.json",
"website/public/locales/ru/tasks.json"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,610 | issue_to_patch | Fix Typo | What a better way to start contributing than fixing a typo 😄 | c2f444d0d85f81db2f9d35507831865b45d40d6c | 74d7dac4ea4b9c090286624145ff6b2f92a82b5b | diff --git a/docs/blog/2023-02-11-architecture.md b/docs/blog/2023-02-11-architecture.md
index 4eb026af71..434a32ee6a 100644
--- a/docs/blog/2023-02-11-architecture.md
+++ b/docs/blog/2023-02-11-architecture.md
@@ -10,7 +10,7 @@ I thought it would make sense to document our architecture as a blog post, since
it would ... | [
"docs/blog/2023-02-11-architecture.md"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,622 | issue_to_patch | Bump pino-pretty from 10.0.0 to 10.2.0 in /website | Bumps [pino-pretty](https://github.com/pinojs/pino-pretty) from 10.0.0 to 10.2.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/pinojs/pino-pretty/releases">pino-pretty's releases</a>.</em></p>
<blockquote>
<h2>v10.2.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Remove coveralls b... | 2d058dd50ced83feced316b9534089de072c97b9 | 861f3d0f0ddf52b390397340c386872441f78627 | diff --git a/website/package-lock.json b/website/package-lock.json
index 77ebdc66b4..098f492c7f 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -99,7 +99,7 @@
"msw": "^1.2.1",
"msw-storybook-addon": "^1.8.0",
"path-browserify": "^1.0.1",
- "pino-pretty": "^10.... | [
"website/package-lock.json",
"website/package.json"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,620 | issue_to_patch | Bump @storybook/testing-library from 0.1.0 to 0.2.0 in /website | Bumps [@storybook/testing-library](https://github.com/storybookjs/testing-library) from 0.1.0 to 0.2.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/storybookjs/testing-library/releases"><code>@storybook/testing-library</code>'s releases</a>.</em></p>
<blockquote>
<h2>v0.2... | 2d058dd50ced83feced316b9534089de072c97b9 | 647341548b865a96a54108f83522b916b295a092 | diff --git a/website/package-lock.json b/website/package-lock.json
index 77ebdc66b4..361c8a86b6 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -79,7 +79,7 @@
"@storybook/addon-links": "^7.0.20",
"@storybook/nextjs": "^7.0.22",
"@storybook/react": "^7.0.22",
- ... | [
"website/package-lock.json",
"website/package.json"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,597 | issue_to_patch | Custom instructions feature | Added basic functionality of "custom-instructions"
It utilises two additional fields in work_parameters:
- user_profile (here user would describe what he wants to share with
llm, for chat session)
- user_response_instructions (here user would describe how they want llm to
respond to questions and queries, li... | 3c8f93e075589958350cd0208be1e07c3ee2b515 | 12c371595070ae312f549dc9d064b0360572173c | diff --git a/inference/server/oasst_inference_server/routes/chats.py b/inference/server/oasst_inference_server/routes/chats.py
index 8b151074b3..1959b094e7 100644
--- a/inference/server/oasst_inference_server/routes/chats.py
+++ b/inference/server/oasst_inference_server/routes/chats.py
@@ -153,6 +153,8 @@ async def cre... | [
"inference/server/oasst_inference_server/routes/chats.py",
"inference/server/oasst_inference_server/schemas/chat.py",
"inference/worker/chat_chain.py",
"inference/worker/chat_chain_prompts.py",
"inference/worker/chat_chain_utils.py",
"inference/worker/work.py",
"oasst-shared/oasst_shared/schemas/inferen... | [
{
"comment": "Can we change this so that the whole custom instruction prefix is not prepended at all if no instructions are given? Otherwise we are just using up tokens for no reason, as the worker retains the system prompt in context always at the cost of other tokens",
"path": "inference/worker/work.py",
... | true | ||
LAION-AI/Open-Assistant | 3,597 | comment_to_fix | Custom instructions feature | Can we change this so that the whole custom instruction prefix is not prepended at all if no instructions are given? Otherwise we are just using up tokens for no reason, as the worker retains the system prompt in context always at the cost of other tokens | 3c8f93e075589958350cd0208be1e07c3ee2b515 | 12c371595070ae312f549dc9d064b0360572173c | diff --git a/inference/worker/work.py b/inference/worker/work.py
index 9fe81491d1..c2dfa6f0f7 100644
--- a/inference/worker/work.py
+++ b/inference/worker/work.py
@@ -9,6 +9,7 @@
import websocket
from chat_chain_prompts import (
ASSISTANT_PREFIX,
+ CUSTOM_INSTRUCTIONS_PREFIX,
END_SEQ,
OBSERVATION_SE... | [
"inference/worker/work.py"
] | [
{
"comment": "Can we change this so that the whole custom instruction prefix is not prepended at all if no instructions are given? Otherwise we are just using up tokens for no reason, as the worker retains the system prompt in context always at the cost of other tokens",
"path": "inference/worker/work.py",
... | true | ||
LAION-AI/Open-Assistant | 3,597 | comment_to_fix | Custom instructions feature | Also here - surely if `user_profile` and `user_response_instructions` are empty, we want this value `custom_instructions` to also be an entirely empty string, without the contents of `CUSTOM_INSTRUCTIONS_PREFIX` | 3c8f93e075589958350cd0208be1e07c3ee2b515 | 12c371595070ae312f549dc9d064b0360572173c | diff --git a/inference/worker/chat_chain.py b/inference/worker/chat_chain.py
index c4a5406976..70c732bbb3 100644
--- a/inference/worker/chat_chain.py
+++ b/inference/worker/chat_chain.py
@@ -6,6 +6,7 @@
import websocket
from chat_chain_prompts import (
ASSISTANT_PREFIX,
+ CUSTOM_INSTRUCTIONS_PREFIX,
HUMA... | [
"inference/worker/chat_chain.py"
] | [
{
"comment": "Also here - surely if `user_profile` and `user_response_instructions` are empty, we want this value `custom_instructions` to also be an entirely empty string, without the contents of `CUSTOM_INSTRUCTIONS_PREFIX`",
"path": "inference/worker/chat_chain.py",
"hunk": "@@ -355,11 +379,17 @@ def... | true | ||
LAION-AI/Open-Assistant | 3,597 | comment_to_fix | Custom instructions feature | This can be simplified a bit (currently the same `if` condition is repeated)
```suggestion
work_params = work_request.parameters
if work_params.system_prompt or work_params.user_profile or work_params.user_response_instructions:
pre_prompt = V2_SYSTEM_PREFIX + (work_params.system_prompt or "")
``` | 3c8f93e075589958350cd0208be1e07c3ee2b515 | 12c371595070ae312f549dc9d064b0360572173c | diff --git a/inference/worker/work.py b/inference/worker/work.py
index 9fe81491d1..c2dfa6f0f7 100644
--- a/inference/worker/work.py
+++ b/inference/worker/work.py
@@ -9,6 +9,7 @@
import websocket
from chat_chain_prompts import (
ASSISTANT_PREFIX,
+ CUSTOM_INSTRUCTIONS_PREFIX,
END_SEQ,
OBSERVATION_SE... | [
"inference/worker/work.py"
] | [
{
"comment": "This can be simplified a bit (currently the same `if` condition is repeated)\r\n```suggestion\r\n work_params = work_request.parameters\r\n if work_params.system_prompt or work_params.user_profile or work_params.user_response_instructions:\r\n pre_prompt = V2_SYSTEM_PREFIX + (work_par... | true | ||
LAION-AI/Open-Assistant | 3,615 | issue_to_patch | Update: Pydantic version from 1.10.4 to 1.10.7 | c2f444d0d85f81db2f9d35507831865b45d40d6c | 0d0c0cbd63b5b6eb02c2085e06fd7352b8b213c8 | diff --git a/backend/requirements.txt b/backend/requirements.txt
index b5cf3ca991..79765cd531 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -10,8 +10,8 @@ loguru==0.6.0
numpy>=1.23.2
prometheus-fastapi-instrumentator==5.9.1
psycopg2-binary==2.9.5
-pydantic==1.10.4
-pydantic[email]==1.10.4
+... | [
"backend/requirements.txt",
"oasst-data/pyproject.toml",
"oasst-shared/pyproject.toml"
] | [] | true | |||
LAION-AI/Open-Assistant | 3,606 | issue_to_patch | Dolphin gpt 3.5 data mix | - Added dolphin random data mix to form conversations from gpt 3.5 file.
- Instructions of the same type are only considered while picking at random to form conversation
- Also ensured that same samples are not considered more than once
Configure
```
- dolphin-mix
num_samples: 100000
max_char_... | 0c2fa4ca33bbe5e734586e78eec2c0877cba2a92 | b7a4fd2e5d880f6d09628772da61f97ccf6c1c12 | diff --git a/model/model_training/custom_datasets/__init__.py b/model/model_training/custom_datasets/__init__.py
index 740fae8563..3043a5db12 100644
--- a/model/model_training/custom_datasets/__init__.py
+++ b/model/model_training/custom_datasets/__init__.py
@@ -8,7 +8,7 @@
from model_training.custom_datasets.instruct... | [
"model/model_training/custom_datasets/__init__.py",
"model/model_training/custom_datasets/prompt_dialogue.py"
] | [
{
"comment": "I should have used shuffle(seed) too in my code ;-) .. will update later.",
"path": "model/model_training/custom_datasets/prompt_dialogue.py",
"hunk": "@@ -193,3 +194,61 @@ def __getitem__(self, idx):\n ]\n \n return DatasetEntrySft(conversation=conv_utt, system_message=ins... | true | ||
LAION-AI/Open-Assistant | 3,605 | issue_to_patch | Add dataset loader for MegaCodeTraining112k & Evol-Instruct-Code-80k-v1 | Added code to load `rombodawg/MegaCodeTraining112k` (key: megacode) and `nickrosh/Evol-Instruct-Code-80k-v1` (key: evol_instruct_code).
Also added an optional `fill_min_length` parameter to `InstructionDataset` class. If specified instructions are concatenate until the total string length of prompts and completions ex... | 0c2fa4ca33bbe5e734586e78eec2c0877cba2a92 | af608b9aa65cf5805ab497e0f99af02a759b5b6d | diff --git a/model/model_training/custom_datasets/instruction.py b/model/model_training/custom_datasets/instruction.py
index c93fad81f1..c6b6acd8dd 100644
--- a/model/model_training/custom_datasets/instruction.py
+++ b/model/model_training/custom_datasets/instruction.py
@@ -1,6 +1,9 @@
"""
These are in the form o... | [
"model/model_training/custom_datasets/instruction.py",
"model/pyproject.toml"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,573 | issue_to_patch | Cleanup `handle_worker()` in preparation for #2815 (Stop generation early) | In this PR, I clean up the `handle_worker()` method a bit so that I can later extend it (in a future PR). There are no functional changes in this PR.
Changes:
- collect the many variables in a new class `HandleWorkerContext` that also features methods for initialization and destruction
- collect methods to handle ... | b8637f2ed589904a76f2e7f537397dec8ef7fb0f | df708d33ba78a7613ca79cc96ea4d279d3fa5049 | diff --git a/inference/server/oasst_inference_server/routes/workers.py b/inference/server/oasst_inference_server/routes/workers.py
index 6562624967..20195f9b2d 100644
--- a/inference/server/oasst_inference_server/routes/workers.py
+++ b/inference/server/oasst_inference_server/routes/workers.py
@@ -1,6 +1,7 @@
import a... | [
"inference/server/oasst_inference_server/routes/workers.py",
"inference/server/oasst_inference_server/worker_utils.py"
] | [
{
"comment": "Moved to the `SessionManager` without changes",
"path": "inference/server/oasst_inference_server/routes/workers.py",
"hunk": "@@ -43,20 +44,6 @@ def __init__(\n self.original_exception = original_exception\n \n \n-async def add_worker_connect_event(\n- session: database.AsyncSes... | true | ||
LAION-AI/Open-Assistant | 3,598 | issue_to_patch | Fix Rope scaling | ## What
Fixed rope scaling for all models.
## Why
Earlier the model config was being ignored during patching which might cause issues like initializing with wrong `max_position_embeddings`
## How
Gets required args from model_config and passes it to patching functions. | a637ca623c9992671f0d786eac8322c082d5eee6 | e67cfd87ece8406796da727a60edd0bfdb74478e | diff --git a/model/model_training/configs/config.yaml b/model/model_training/configs/config.yaml
index adbb01354a..a7c1f70c5d 100644
--- a/model/model_training/configs/config.yaml
+++ b/model/model_training/configs/config.yaml
@@ -786,7 +786,7 @@ rope_scaling_test:
dtype: bf16
log_dir: "llama_log_7b"
learning_... | [
"model/model_training/configs/config.yaml",
"model/model_training/models/patching.py",
"model/model_training/models/rope.py"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,600 | issue_to_patch | Bump next from 13.4.8 to 13.4.12 in /website | Bumps [next](https://github.com/vercel/next.js) from 13.4.8 to 13.4.12.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/vercel/next.js/releases">next's releases</a>.</em></p>
<blockquote>
<h2>v13.4.12</h2>
<h3>Core Changes</h3>
<ul>
<li>Separate routing code from render server... | a637ca623c9992671f0d786eac8322c082d5eee6 | d2c8c2eeb50f5923e6740ff19c501db69340a7a4 | diff --git a/website/package-lock.json b/website/package-lock.json
index 7ddd66afcb..630a2415f8 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -42,7 +42,7 @@
"friendly-username-generator": "^2.0.4",
"lande": "^1.0.10",
"lucide-react": "^0.105.0",
- "next": "^... | [
"website/package-lock.json",
"website/package.json"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,601 | issue_to_patch | Bump tailwindcss from 3.3.2 to 3.3.3 in /website | Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.3.2 to 3.3.3.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/tailwindlabs/tailwindcss/releases">tailwindcss's releases</a>.</em></p>
<blockquote>
<h2>v3.3.3</h2>
<h3>Fixed</h3>
<ul>
<li>Fix issue where so... | a637ca623c9992671f0d786eac8322c082d5eee6 | 95efdfd24ae2cf10799389c3105e022425e31c4b | diff --git a/website/package-lock.json b/website/package-lock.json
index 7ddd66afcb..91203feaf5 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -64,7 +64,7 @@
"sharp": "^0.32.1",
"simplebar-react": "^3.2.4",
"swr": "^2.2.0",
- "tailwindcss": "^3.3.2",
+ ... | [
"website/package-lock.json",
"website/package.json"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,566 | issue_to_patch | Implement Celery task for Discord notifications of reports
The previous implementation caused a bug and so is reverted by #3516 | 3517 - Send reports to discord via celery task | It should fix: https://github.com/LAION-AI/Open-Assistant/issues/3517
In debeb353cc0104a0a330637d078b9b0bc41afe84 we reverted the original implementation of the task as it broke the production environment. The problem was that celery tasks need objects that could be JSON serializable and we were passing a `Message` ... | 018657b994d163df1b132748558a450ef31da8b5 | 1acb3caef39764877465bc319c703f97b98e9046 | diff --git a/backend/oasst_backend/prompt_repository.py b/backend/oasst_backend/prompt_repository.py
index d5f1a477aa..a16e2cf373 100644
--- a/backend/oasst_backend/prompt_repository.py
+++ b/backend/oasst_backend/prompt_repository.py
@@ -30,8 +30,8 @@
from oasst_backend.models.payload_column_type import PayloadContai... | [
"backend/oasst_backend/prompt_repository.py",
"backend/oasst_backend/utils/discord.py"
] | [] | true | |
LAION-AI/Open-Assistant | 3,595 | issue_to_patch | Update Flash Attention forward for Llama 2: | GQA for 34B and 70B and tp have been [added ](https://github.com/huggingface/transformers/blob/main/src/transformers/models/llama/modeling_llama.py#L281)
The current flash attn patch forward is for the old transformers' attention forward. | 6336f31edd1b98c8ca5e959329c536a148146101 | fa0f36893ef8a50b47b9c28cc6c9b294d8c3ef4d | diff --git a/model/model_training/models/patching_llama.py b/model/model_training/models/patching_llama.py
index f05e2d3c34..105f41b3a2 100644
--- a/model/model_training/models/patching_llama.py
+++ b/model/model_training/models/patching_llama.py
@@ -4,7 +4,8 @@
import torch
import torch.nn as nn
-from transformers... | [
"model/model_training/models/patching_llama.py",
"model/model_training/tests/test_patched_llama.py"
] | [] | diff --git a/model/model_training/tests/test_patched_llama.py b/model/model_training/tests/test_patched_llama.py
index 159a34bd7a..8827f185f2 100644
--- a/model/model_training/tests/test_patched_llama.py
+++ b/model/model_training/tests/test_patched_llama.py
@@ -3,12 +3,12 @@
from transformers import AutoModelForCausa... | true | |
LAION-AI/Open-Assistant | 3,592 | issue_to_patch | Use `rng_seed` param when creating custom dataset sampler | Use the `rng_seed` configuration parameter in class `PerDatasetSampler.build_sampler_from_config()` static factory class method. Until now always the fixed default value of 0 was used as seed for the dataset sampling (which I think was as a bug). | a11971cfaf560b4185724f2c516e5d2228e08c9f | 988e070993091298f6ba7217b504802b44aeda74 | diff --git a/model/model_training/trainer_rl.py b/model/model_training/trainer_rl.py
index 9821c481ec..f8756c3152 100644
--- a/model/model_training/trainer_rl.py
+++ b/model/model_training/trainer_rl.py
@@ -3,6 +3,7 @@
import os
import random
from argparse import Namespace
+from typing import Sequence
import nump... | [
"model/model_training/trainer_rl.py",
"model/model_training/trainer_rm.py",
"model/model_training/trainer_sft.py",
"model/model_training/utils/utils.py"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,587 | issue_to_patch | OA dataloader raises an error when training the reward model
During training the reward model using the `oasst` dataset, using the following command:
```bash
python trainer_rm.py --configs defaults_rm oasst-rm-1-pythia-1.4b
```
the data loader raises an error:
**TypeError: 'NoneType' object is not iterable**
```... | fixed "TypeError: 'NoneType' object is not iterable" for reward model… | During training the reward model using the `oasst` dataset, using the following command:
```bash
python trainer_rm.py --configs defaults_rm oasst-rm-1-pythia-1.4b
```
the data loader raises an error:
**TypeError: 'NoneType' object is not iterable**
```
│ Open-Assistant/model/model_training/custom_datasets/oasst_... | 1e6e56975b12a8d6ecc3253ef4e42e496136c7a0 | ed6f88fd18bf276d806a85d9e5586298dfa9b9ae | diff --git a/model/model_training/custom_datasets/oasst_dataset.py b/model/model_training/custom_datasets/oasst_dataset.py
index 37bf2a71ca..eec0ce8849 100644
--- a/model/model_training/custom_datasets/oasst_dataset.py
+++ b/model/model_training/custom_datasets/oasst_dataset.py
@@ -98,6 +98,8 @@ def leaf_filter(thread:... | [
"model/model_training/custom_datasets/oasst_dataset.py"
] | [] | true | |
LAION-AI/Open-Assistant | 3,589 | issue_to_patch | Bump @chakra-ui/react from 2.7.1 to 2.8.0 in /website | Bumps [@chakra-ui/react](https://github.com/chakra-ui/chakra-ui/tree/HEAD/packages/components/react) from 2.7.1 to 2.8.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/chakra-ui/chakra-ui/releases"><code>@chakra-ui/react</code>'s releases</a>.</em></p>
<blockquote>
<h2><cod... | 982ac1835f3a89db587d21c34ca072da5a428015 | 0f213f374f7aeaecce44debc185b0eae5e613085 | diff --git a/website/package-lock.json b/website/package-lock.json
index bea55809cb..7ddd66afcb 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -12,7 +12,7 @@
"@bytemd/plugin-math": "^1.21.0",
"@bytemd/react": "^1.21.0",
"@chakra-ui/icons": "^2.0.19",
- "@chak... | [
"website/package-lock.json",
"website/package.json"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,578 | issue_to_patch | Bump @chakra-ui/react from 2.7.0 to 2.7.1 in /website | Bumps [@chakra-ui/react](https://github.com/chakra-ui/chakra-ui/tree/HEAD/packages/components/react) from 2.7.0 to 2.7.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/chakra-ui/chakra-ui/releases"><code>@chakra-ui/react</code>'s releases</a>.</em></p>
<blockquote>
<h2><cod... | b8637f2ed589904a76f2e7f537397dec8ef7fb0f | 0cd13c5a2e927be88cb7d3bb052b5f7b90c237c0 | diff --git a/website/package-lock.json b/website/package-lock.json
index 56618c6849..8ad2c58268 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -12,7 +12,7 @@
"@bytemd/plugin-math": "^1.21.0",
"@bytemd/react": "^1.21.0",
"@chakra-ui/icons": "^2.0.19",
- "@chak... | [
"website/package-lock.json",
"website/package.json"
] | [] | true | ||
LAION-AI/Open-Assistant | 3,579 | issue_to_patch | Bump react-textarea-autosize from 8.4.1 to 8.5.2 in /website | Bumps [react-textarea-autosize](https://github.com/Andarist/react-textarea-autosize) from 8.4.1 to 8.5.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/Andarist/react-textarea-autosize/releases">react-textarea-autosize's releases</a>.</em></p>
<blockquote>
<h2>v8.5.2</h2>
<h... | b8637f2ed589904a76f2e7f537397dec8ef7fb0f | 1967cc4b78bd0d5fb588f1c05fb535b3c2e53a38 | diff --git a/website/package-lock.json b/website/package-lock.json
index 56618c6849..51775a03f3 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -57,7 +57,7 @@
"react-i18next": "^12.2.2",
"react-markdown": "^8.0.7",
"react-syntax-highlighter": "^15.5.0",
- "rea... | [
"website/package-lock.json",
"website/package.json"
] | [] | true | ||
LMAX-Exchange/disruptor | 495 | issue_to_patch | Run CI on Java 21 | If we're running it on Java 21 ourselves, we should probably have CI test it here aswell. | 003ac1326be415c2387854f0c4dc4654e66cd986 | ddfad228e91f4ee5a4b4afb509e07f0d2d24b829 | diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
index 77b5ec497..70a543dfd 100644
--- a/.github/workflows/gradle-build.yml
+++ b/.github/workflows/gradle-build.yml
@@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [ 11, 17 ]
+ java... | [
".github/workflows/gradle-build.yml",
".github/workflows/jcstress-manual.yml",
".github/workflows/jcstress-quick.yml",
"build.gradle",
"gradle/perf.gradle",
"gradle/wrapper/gradle-wrapper.jar",
"gradle/wrapper/gradle-wrapper.properties",
"gradlew",
"gradlew.bat"
] | [] | true | ||
LMAX-Exchange/disruptor | 492 | issue_to_patch | Add @FunctionalInteface annotation for the eventhandlerbase | Disruptor uses java Lambdas pretty liberally in its documentation. This is fine, but there's an annotation to designate this.
While it's not strictly required, as Java will coerce even without it, a lack of the @FunctionalInterface makes it so Clojure cannot use its lambda syntax with Disruptor.
Since I don't... | 7febcfd718090bfe241d1dc7968e2979242c68bb | b21971361612249a3ef94cd9f22be9d5133f0799 | diff --git a/src/main/java/com/lmax/disruptor/EventHandlerBase.java b/src/main/java/com/lmax/disruptor/EventHandlerBase.java
index dfda8a416..646380135 100644
--- a/src/main/java/com/lmax/disruptor/EventHandlerBase.java
+++ b/src/main/java/com/lmax/disruptor/EventHandlerBase.java
@@ -15,6 +15,7 @@
*/
package com.lma... | [
"src/main/java/com/lmax/disruptor/EventHandlerBase.java"
] | [] | true | ||
LMAX-Exchange/disruptor | 494 | issue_to_patch | Update upload-artifact to v4 | CI doesn't work anymore with this at version 3 | 86a848e859a8626978f95c181ee7f5c13b6447f3 | bf64803569bd740b3fb58c1f4021cec2d1e62127 | diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
index 1d6789b41..77b5ec497 100644
--- a/.github/workflows/gradle-build.yml
+++ b/.github/workflows/gradle-build.yml
@@ -21,9 +21,9 @@ jobs:
- name: Build with Gradle
run: ./gradlew build
- name: Archive artifacts... | [
".github/workflows/gradle-build.yml",
".github/workflows/jcstress-manual.yml",
".github/workflows/jcstress-quick.yml"
] | [] | true | ||
LMAX-Exchange/disruptor | 483 | issue_to_patch | Add JMH benchmark to measure multi-producer batch publication performance. | Batch publication has much more complicated logic in the `MultiProducerSequencer` compared to the `SingleProducerSequencer` where the cursor is simply updated with the high sequence value.
Therefore, there is also room for optimizations! :-)
Specifically, I am working on an idea to use just a single bit per slot in t... | f0a1d607cfffd48494444e85e3401a8cf1a16bb3 | 24fb16ffa2db3dbb81040cb65e07a7870e174ba7 | diff --git a/src/jmh/java/com/lmax/disruptor/MultiProducerSingleConsumer.java b/src/jmh/java/com/lmax/disruptor/MultiProducerSingleConsumer.java
index 59a386540..41b2f5853 100644
--- a/src/jmh/java/com/lmax/disruptor/MultiProducerSingleConsumer.java
+++ b/src/jmh/java/com/lmax/disruptor/MultiProducerSingleConsumer.java... | [
"src/jmh/java/com/lmax/disruptor/MultiProducerSingleConsumer.java"
] | [] | true | ||
LMAX-Exchange/disruptor | 476 | issue_to_patch | Fix asciidoctor build by moving away from pygments highlighting to ro… | Gradle build is currently failing due to
```
> Could not resolve all files for configuration ':classpath'.
> Could not find com.burgstaller:okhttp-digest:1.10.
Searched in the following locations:
- https://plugins.gradle.org/m2/com/burgstaller/okhttp-digest/1.10/okhttp-digest-1.10.pom
```
Le... | 95c705f60c1833b07f1fed6e08a08d7bee7f0971 | 7f2fdf569d5701c21266cc4a709e527bfacf5554 | diff --git a/build.gradle b/build.gradle
index a26321e69..30f6b06d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,6 @@ plugins {
id 'idea'
id "io.github.reyerizo.gradle.jcstress" version "0.8.14"
id 'org.asciidoctor.jvm.convert' version '3.3.2'
- id 'org.asciidoctor.jvm.gems' version '3.3.... | [
"build.gradle",
"gradle/asciidoc.gradle"
] | [] | true | ||
LMAX-Exchange/disruptor | 459 | issue_to_patch | update a typo | 0088c5fab8bfcd2abb910cf513adeaffcdbaa36f | 360cbcf6a956aab02499f9165a3d462aa7f13a1a | diff --git a/src/docs/asciidoc/en/user-guide/10_using_the_disruptor.adoc b/src/docs/asciidoc/en/user-guide/10_using_the_disruptor.adoc
index c93eb03e5..1490b7802 100644
--- a/src/docs/asciidoc/en/user-guide/10_using_the_disruptor.adoc
+++ b/src/docs/asciidoc/en/user-guide/10_using_the_disruptor.adoc
@@ -52,7 +52,7 @@ M... | [
"src/docs/asciidoc/en/user-guide/10_using_the_disruptor.adoc"
] | [] | true | |||
LMAX-Exchange/disruptor | 455 | issue_to_patch | Use Util.getSequencesFor to create sequences from processors | This change is a very minor cleanup.
The new code uses the expected helper to extract sequences from processors.
Also, the sequence array is now only created once and reused for `addGatingSequences` and `new EventHandlerGroup`, which should be safe because the `EventHandlerGroup` constructor makes defensive copie... | 87156a05646221b660e8a90e7bc161498723781d | f164d9ff5431146a394cd5dc06be81116449c4b8 | diff --git a/src/main/java/com/lmax/disruptor/dsl/Disruptor.java b/src/main/java/com/lmax/disruptor/dsl/Disruptor.java
index fccb46e39..4ad200c98 100644
--- a/src/main/java/com/lmax/disruptor/dsl/Disruptor.java
+++ b/src/main/java/com/lmax/disruptor/dsl/Disruptor.java
@@ -195,15 +195,11 @@ public EventHandlerGroup<T> h... | [
"src/main/java/com/lmax/disruptor/dsl/Disruptor.java"
] | [] | true | ||
LMAX-Exchange/disruptor | 448 | issue_to_patch | Fix GitHub Actions for the New Permissions System | 76f7c28e206ff2e50b9712a5bd862fb1903d2289 | b03e5f7ed5970b4fce0d7c863311b8c0d1a2d5d0 | diff --git a/.github/workflows/asciidoc.yml b/.github/workflows/asciidoc.yml
index 57b376de5..4573d5aad 100644
--- a/.github/workflows/asciidoc.yml
+++ b/.github/workflows/asciidoc.yml
@@ -4,6 +4,9 @@ on:
push:
branches: [ master ]
+permissions:
+ contents: write
+
jobs:
checkout-and-deploy:
runs-on... | [
".github/workflows/asciidoc.yml",
".github/workflows/codeql-analysis.yml"
] | [] | true | |||
LMAX-Exchange/disruptor | 440 | issue_to_patch | `EventHandler::setSequenceCallback` will not play well with `RewindableException` throwing event handlers
Since #364 we have the concept of `EventHandler::onEvent` being able to throw a `RewindableException` which the `BatchEventProcessor` will handle and reset the sequence to the start of batch before trying to proce... | Rewindable event handler separation | This should give us type-safe rewindable and non-rewindable `EventHandler` implementations.
Non-rewindable implementations will not be able to throw `RewindableException` but will be able to implement `EventHandler::setSequenceCallback` and the opposite for rewindable implementations.
This will fix #437 | ae0e471c5cff8602439fada6382b9dfd41de1911 | 63d5af7b9e1773eb5def4bfe2f9cf7a74c952f3b | diff --git a/src/examples/java/com/lmax/disruptor/examples/DynamicallyAddHandler.java b/src/examples/java/com/lmax/disruptor/examples/DynamicallyAddHandler.java
index fd24d95e1..8932a7152 100644
--- a/src/examples/java/com/lmax/disruptor/examples/DynamicallyAddHandler.java
+++ b/src/examples/java/com/lmax/disruptor/exa... | [
"src/examples/java/com/lmax/disruptor/examples/DynamicallyAddHandler.java",
"src/main/java/com/lmax/disruptor/BatchEventProcessor.java",
"src/main/java/com/lmax/disruptor/BatchEventProcessorBuilder.java",
"src/main/java/com/lmax/disruptor/EventHandler.java",
"src/main/java/com/lmax/disruptor/EventHandlerBas... | [
{
"comment": "Rather than a `boolean`, could we have behaviour?",
"path": "src/main/java/com/lmax/disruptor/BatchEventProcessor.java",
"hunk": "@@ -37,31 +38,112 @@\n private ExceptionHandler<? super T> exceptionHandler;\n private final DataProvider<T> dataProvider;\n private final SequenceB... | diff --git a/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java b/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java
index 4e42e4a12..acd9b4078 100644
--- a/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java
+++ b/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java
@@ -44,7 +4... | true |
LMAX-Exchange/disruptor | 439 | issue_to_patch | Add a maximum batch size to the `BatchEventProcessor`
To limit the number of events processed by `BatchEventProcessor` before updating the sequence currently you can implement `EventHandler::setSequenceCallback` to store the `Sequence` and update it when needed while handling events. See `com.lmax.disruptor.examples.E... | Add max batch size limit to BatchEventProcessor | Add an optional `maxBatchSize` parameter to `BatchEventProcessor`.
Defaults to `Integer.MAX_VALUE`.
Limits the amount of events that will be processed before updating the sequence in the `BatchEventProcessor`.
Closes #438 | c8dcf814f74afa0936b197489c0e9cabce036f94 | ee7d50296f14da7aba00fca20194697e6b096cb1 | diff --git a/src/main/java/com/lmax/disruptor/BatchEventProcessor.java b/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
index 2195c9711..1534f7077 100644
--- a/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
+++ b/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
@@ -18,6 +18,7 @@
import j... | [
"src/main/java/com/lmax/disruptor/BatchEventProcessor.java",
"src/main/java/com/lmax/disruptor/EventHandler.java",
"src/perftest/java/com/lmax/disruptor/offheap/OneToOneOffHeapThroughputTest.java",
"src/perftest/java/com/lmax/disruptor/offheap/OneToOneOnHeapThroughputTest.java",
"src/perftest/java/com/lmax/... | [
{
"comment": "Can we replace this `Integer.MAX_VALUE` with a constant? `DEFAULT_MAX_BATCH_SIZE` maybe?",
"path": "src/main/java/com/lmax/disruptor/BatchEventProcessor.java",
"hunk": "@@ -49,19 +51,44 @@\n * @param dataProvider to which events are published.\n * @param sequenceBarrier on whi... | diff --git a/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java b/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java
index 8153533fd..4e42e4a12 100644
--- a/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java
+++ b/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java
@@ -162,7 +... | true |
LMAX-Exchange/disruptor | 433 | issue_to_patch | add toString method in LongEvent | make LongEventMain output more friendly ^_^ | f42fc745dd6916017723ebe6dc1457501bc44f71 | b52c4c6fdd67be52604d64c0d635cc2559003a20 | diff --git a/src/examples/java/com/lmax/disruptor/examples/longevent/LongEvent.java b/src/examples/java/com/lmax/disruptor/examples/longevent/LongEvent.java
index cd076051f..c88feb280 100644
--- a/src/examples/java/com/lmax/disruptor/examples/longevent/LongEvent.java
+++ b/src/examples/java/com/lmax/disruptor/examples/... | [
"src/examples/java/com/lmax/disruptor/examples/longevent/LongEvent.java"
] | [] | true | ||
LMAX-Exchange/disruptor | 421 | issue_to_patch | A PR For issue #420 | As mentioned issue 420:
1.RingBufferFields constructor method optimized
In RingBufferFields constructor metod:
`this.bufferSize = sequencer.getBufferSize();`
this line initialized the bufferSize field,so the next line
`this.entries = (E[]) new Object[sequencer.getBufferSize() + 2 * BUFFER_PAD];`
sequencer.getBuff... | ea78402656af6f6d1fc1d8b2497273fee267d148 | 0430e863c49e0719617bb63dcadca7e4c39cb0ab | diff --git a/src/main/java/com/lmax/disruptor/RingBuffer.java b/src/main/java/com/lmax/disruptor/RingBuffer.java
index 031271bb9..38a9181ff 100644
--- a/src/main/java/com/lmax/disruptor/RingBuffer.java
+++ b/src/main/java/com/lmax/disruptor/RingBuffer.java
@@ -57,7 +57,7 @@ abstract class RingBufferFields<E> extends Ri... | [
"src/main/java/com/lmax/disruptor/RingBuffer.java"
] | [] | true | ||
LMAX-Exchange/disruptor | 432 | issue_to_patch | pictures in doc files are broken
Though it is not a functional bug, but brings bad experience while reading docs. ^_^ | Make images work in both IDEA and Gradle | As per [eddieHRS](https://github.com/eddieHRS)'s comment, we can default the `imagesdir` property in the `.adoc` files to be IDEA friendly, and then override the value for this to something more appropriate for Gradle when building. This seems like it works for both situations.
Fixes #431 | 305d7371765b0cf0f670a059cbfaf9e0691da27c | 9b4dfcf21dfe9f70aa63d3520195452321730c39 | diff --git a/gradle/asciidoc.gradle b/gradle/asciidoc.gradle
index 81b9d091e..5be911c12 100644
--- a/gradle/asciidoc.gradle
+++ b/gradle/asciidoc.gradle
@@ -31,7 +31,8 @@ asciidoctor {
attributes 'source-highlighter': 'pygments',
'toc': 'left',
'icons': 'font',
- 'xrefstyle': '... | [
"gradle/asciidoc.gradle",
"src/docs/asciidoc/en/disruptor.adoc",
"src/docs/asciidoc/en/index.adoc",
"src/docs/asciidoc/en/user-guide/10_using_the_disruptor.adoc",
"src/docs/asciidoc/en/user-guide/index.adoc"
] | [] | true | |
LMAX-Exchange/disruptor | 427 | issue_to_patch | Change `.md` files to `.adoc` in project root | I think this addresses some of the final issues of https://github.com/LMAX-Exchange/disruptor/issues/336 | 3ad8dc897a9e46083a9d0bb0971408a4a682e852 | 7f25dd0b12acb6bc32b8e9fb4a4183a5db8a96ef | diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
new file mode 100644
index 000000000..2d112831e
--- /dev/null
+++ b/CHANGELOG.adoc
@@ -0,0 +1,5 @@
+:Author: LMAX Development Team
+:Email:
+:Date: {docdata}
+
+include::./src/docs/asciidoc/en/changelog.adoc[]
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG... | [
"CHANGELOG.adoc",
"CHANGELOG.md",
"README.adoc",
"README.md",
"src/docs/asciidoc/en/changelog.adoc"
] | [] | true | ||
LMAX-Exchange/disruptor | 399 | issue_to_patch | Reduce the amount of `instanceof` | As mentioned in #398 the `BatchEventProcessor` uses `instanceof` (along with casting and null checks) a few times to detect `eventHandler` which may implement some "extension" interfaces.
This use of `instanceof` could be removed by making the interface `EventHandler` extend the extension interfaces, so all implemen... | 93fe9f716d87ae3c297283870d5824257f8b2625 | 41019373a0a8e9ac2708cddd75be338fe69f1171 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d7f770ca..c3fc4112f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
- Minimum Java version now 11
- Issue #323 - `WorkerPool` and `WorkProcessor` have been removed, no more `Disruptor::handleEventsWithWorkerPool`
- `Disruptor` constructors usi... | [
"CHANGELOG.md",
"src/examples/java/com/lmax/disruptor/examples/DynamicallyAddHandler.java",
"src/examples/java/com/lmax/disruptor/examples/EarlyReleaseHandler.java",
"src/examples/java/com/lmax/disruptor/examples/NamedEventHandler.java",
"src/examples/java/com/lmax/disruptor/examples/WaitForShutdown.java",
... | [
{
"comment": "typo: extnsion",
"path": "CHANGELOG.md",
"hunk": "@@ -6,6 +6,10 @@\n - Minimum Java version now 11\n - Issue #323 - `WorkerPool` and `WorkProcessor` have been removed, no more `Disruptor::handleEventsWithWorkerPool`\n - `Disruptor` constructors using Executor have been removed.... | diff --git a/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java b/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java
index b3f5a100f..8153533fd 100644
--- a/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java
+++ b/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java
@@ -158,7 +... | true | |
LMAX-Exchange/disruptor | 399 | comment_to_fix | Reduce the amount of `instanceof` | typo: extnsion | 93fe9f716d87ae3c297283870d5824257f8b2625 | 41019373a0a8e9ac2708cddd75be338fe69f1171 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d7f770ca..c3fc4112f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
- Minimum Java version now 11
- Issue #323 - `WorkerPool` and `WorkProcessor` have been removed, no more `Disruptor::handleEventsWithWorkerPool`
- `Disruptor` constructors usi... | [
"CHANGELOG.md"
] | [
{
"comment": "typo: extnsion",
"path": "CHANGELOG.md",
"hunk": "@@ -6,6 +6,10 @@\n - Minimum Java version now 11\n - Issue #323 - `WorkerPool` and `WorkProcessor` have been removed, no more `Disruptor::handleEventsWithWorkerPool`\n - `Disruptor` constructors using Executor have been removed.... | true | ||
LMAX-Exchange/disruptor | 418 | issue_to_patch | Update AggregateEventHandlerTest.java | rename function name | ea78402656af6f6d1fc1d8b2497273fee267d148 | 319882b9cacbffa0f17b382012dcf47c7c68946b | [
"src/test/java/com/lmax/disruptor/AggregateEventHandlerTest.java"
] | [] | diff --git a/src/test/java/com/lmax/disruptor/AggregateEventHandlerTest.java b/src/test/java/com/lmax/disruptor/AggregateEventHandlerTest.java
index 855b8123d..dee923c64 100644
--- a/src/test/java/com/lmax/disruptor/AggregateEventHandlerTest.java
+++ b/src/test/java/com/lmax/disruptor/AggregateEventHandlerTest.java
@@ ... | true | ||
LMAX-Exchange/disruptor | 414 | issue_to_patch | Assert that only a single thread accesses a SingleProducerSequencer. | If a developer uses the wrong ProducerType, it's hard to detect.
This commit adds a check using assertions so a developer can fail in
test instead of being burnt in Production.
(There will be no runtime cost in Production.)
As can be seen from the commit, there was actually a test case that
started failing bec... | 160e7987daf91c57ccfffcd34142409776f8eb3f | 9e29466f612f41b69633e9ef379de066d8479852 | diff --git a/src/main/java/com/lmax/disruptor/SingleProducerSequencer.java b/src/main/java/com/lmax/disruptor/SingleProducerSequencer.java
index 70af43373..c3fad4d08 100644
--- a/src/main/java/com/lmax/disruptor/SingleProducerSequencer.java
+++ b/src/main/java/com/lmax/disruptor/SingleProducerSequencer.java
@@ -18,6 +1... | [
"src/main/java/com/lmax/disruptor/SingleProducerSequencer.java",
"src/test/java/com/lmax/disruptor/SequencerTest.java"
] | [] | diff --git a/src/test/java/com/lmax/disruptor/SequencerTest.java b/src/test/java/com/lmax/disruptor/SequencerTest.java
index 775c2b73f..3f76009ed 100644
--- a/src/test/java/com/lmax/disruptor/SequencerTest.java
+++ b/src/test/java/com/lmax/disruptor/SequencerTest.java
@@ -3,6 +3,7 @@
import com.lmax.disruptor.dsl.Prod... | true | |
LMAX-Exchange/disruptor | 410 | issue_to_patch | A PR for issue#405. | I'm so sorry to delay raising a pull request for issue#405,cause i'm very busy a period ago.
I annotated some method overloads by @Override,it is necesseary for java project.
There are others like this：curly braces should follow the class name immediately, not on another line,etc.
Awaiting your review,thanks. | eaca68cd0719d2181cc3e490b7b3dcc9e7d374c4 | 35f2b934999e5a19dfa64771f2b15bab5d99f716 | diff --git a/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventFactory.java b/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventFactory.java
index 0f2459b84..a729e7871 100644
--- a/src/examples/java/com/lmax/disruptor/examples/longevent/LongEventFactory.java
+++ b/src/examples/java/com/lma... | [
"src/examples/java/com/lmax/disruptor/examples/longevent/LongEventFactory.java",
"src/examples/java/com/lmax/disruptor/examples/longevent/LongEventHandler.java",
"src/examples/java/com/lmax/disruptor/examples/longevent/LongEventProducer.java",
"src/examples/java/com/lmax/disruptor/examples/longevent/LongEvent... | [] | diff --git a/src/test/java/com/lmax/disruptor/RewindBatchEventProcessorTest.java b/src/test/java/com/lmax/disruptor/RewindBatchEventProcessorTest.java
index 323cc79d8..934f993e0 100644
--- a/src/test/java/com/lmax/disruptor/RewindBatchEventProcessorTest.java
+++ b/src/test/java/com/lmax/disruptor/RewindBatchEventProces... | true | |
LMAX-Exchange/disruptor | 324 | issue_to_patch | Evict WorkerPool et al from core of disruptor
These classes aren't used internally at LMAX; this makes it very difficult for us to act as maintainers of them. We're also not hugely convinced that using the disruptor in this way is a good fit for the underlying technology. I'm not going to get out the Jurassic Park sci... | Remove the concept of WorkerPool | Issue #323 - `WorkerPool` and `WorkProcessor` have been removed, no more `Disruptor::handleEventsWithWorkerPool` | 3530a12da8fb4422e1d1784727ac8ce08b11c5fd | b67381615a95643696af3b3b96fff8d133334d9b | diff --git a/CHANGELOG.md b/CHANGELOG.md
index eab0f3b33..dcafcb565 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,7 @@
- Breaking Changes
- Minimum Java version now 11
- - `WorkerPool::halt` and `WorkerPool::drainAndHalt` will now permanently halt the `WorkerPool`
- - `WorkProcessor::halt` and ... | [
"CHANGELOG.md",
"src/main/java/com/lmax/disruptor/EventReleaseAware.java",
"src/main/java/com/lmax/disruptor/EventReleaser.java",
"src/main/java/com/lmax/disruptor/RunState.java",
"src/main/java/com/lmax/disruptor/WorkHandler.java",
"src/main/java/com/lmax/disruptor/WorkProcessor.java",
"src/main/java/c... | [] | diff --git a/src/test/java/com/lmax/disruptor/RemoveWorkHandlerTest.java b/src/test/java/com/lmax/disruptor/RemoveWorkHandlerTest.java
deleted file mode 100644
index f48125b3e..000000000
--- a/src/test/java/com/lmax/disruptor/RemoveWorkHandlerTest.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright 2011 LMAX Ltd.
- ... | true |
LMAX-Exchange/disruptor | 407 | issue_to_patch | Fix shouldNotPassZeroSizeToBatchStartAware | The test setups a latch that is decremented on-event, and then waits on the latch before publishing any event.
Here, `latch.await(2, TimeUnit.SECONDS);` is just a complex equivalent to `Thread.sleep(2000)`, and it makes the test quite slow.
The behavior under test can be validated by increasing the sequencer number... | f8d4db46f69e0da19739cbecb973a27498382984 | 8cc3e94f5e6024339d28e362cf73938f3b56b017 | [
"src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java"
] | [] | diff --git a/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java b/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java
index 174eb5f4d..b3f5a100f 100644
--- a/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java
+++ b/src/test/java/com/lmax/disruptor/BatchEventProcessorTest.java
@@ -280,9 +... | true | ||
LMAX-Exchange/disruptor | 395 | issue_to_patch | Use a logical rather than bitwise AND in `EventPoller` | As far as I can tell, there doesn't appear to be a good reason for using `&` here over `&&`? | 42f11ed83e4909fc3107bf12150768e6d088a1d9 | eaa84129c409d9cb73dc45803c52324382d2a744 | diff --git a/src/main/java/com/lmax/disruptor/EventPoller.java b/src/main/java/com/lmax/disruptor/EventPoller.java
index dc919c4f0..6945277cd 100644
--- a/src/main/java/com/lmax/disruptor/EventPoller.java
+++ b/src/main/java/com/lmax/disruptor/EventPoller.java
@@ -109,7 +109,7 @@ public PollState poll(final Handler<T> ... | [
"src/main/java/com/lmax/disruptor/EventPoller.java"
] | [] | true | ||
LMAX-Exchange/disruptor | 396 | issue_to_patch | Add use of Java 17 to CI | Build and run stress tests using Java 17, as well as the existing Java 11.
The Disruptor 4 will still target Java 11 as the minimum requirement and not use any Java 17 only features.
This is just to check the project builds on Java 17 and we don't introduce any code that is going to break in the next LTS release. | 641c2078bb6a246748ae56e4f5367a1ad55b015f | f62e15e62f19202977184178b3b624ca0d8d2701 | diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
index 3ea162d06..bf8b8ae5d 100644
--- a/.github/workflows/gradle-build.yml
+++ b/.github/workflows/gradle-build.yml
@@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [ 11 ]
+ java: [ ... | [
".github/workflows/gradle-build.yml",
".github/workflows/jcstress-manual.yml",
".github/workflows/jcstress-quick.yml",
"build.gradle",
"gradle/wrapper/gradle-wrapper.properties",
"gradlew",
"src/main/java/com/lmax/disruptor/package-info.java",
"src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java"
... | [] | diff --git a/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java b/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
index f232261ac..212deef7d 100644
--- a/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
+++ b/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
@@ -44,7 +44,6 @@
import java.util... | true | |
LMAX-Exchange/disruptor | 394 | issue_to_patch | GitHub Actions setup-java v2 | https://github.com/actions/setup-java/blob/main/README.md | bf6044095131d7e0abf9f8d010e805479f9ae56d | 9be2c5b728a4dab07526e58956c0ef2aa4b85d56 | diff --git a/.github/workflows/asciidoc-build-only.yml b/.github/workflows/asciidoc-build-only.yml
index 931d7991b..1254100c0 100644
--- a/.github/workflows/asciidoc-build-only.yml
+++ b/.github/workflows/asciidoc-build-only.yml
@@ -16,8 +16,9 @@ jobs:
- name: Checkout
uses: actions/checkout@master
... | [
".github/workflows/asciidoc-build-only.yml",
".github/workflows/asciidoc.yml",
".github/workflows/codeql-analysis.yml",
".github/workflows/gradle-build.yml",
".github/workflows/jcstress-manual.yml",
".github/workflows/jcstress-quick.yml"
] | [] | true | ||
LMAX-Exchange/disruptor | 392 | issue_to_patch | Remove use of Unsafe from Ringbuffer & Util | For #345 we aim to remove dependency on `sun.misc.Unsafe`
Change the RingBuffer to use a plain array access instead of using Unsafe, which appears to have been used in an attempt at speed gains only, no concurrency focus.
I have also added a start of a benchmark on array access to try standard, Unsafe, VarHandle, a... | d36162745a484232d0606fece92564e687c7ca8e | 63f9abca5228380202b44b44c2b166205179b1d1 | diff --git a/src/jcstress/java/com/lmax/disruptor/LoggerInitializationStress.java b/src/jcstress/java/com/lmax/disruptor/LoggerInitializationStress.java
index ce4c86adb..7b54fbf3c 100644
--- a/src/jcstress/java/com/lmax/disruptor/LoggerInitializationStress.java
+++ b/src/jcstress/java/com/lmax/disruptor/LoggerInitializ... | [
"src/jcstress/java/com/lmax/disruptor/LoggerInitializationStress.java",
"src/jmh/java/com/lmax/disruptor/ArrayAccessBenchmark.java",
"src/jmh/java/com/lmax/disruptor/RingBufferBenchmark.java",
"src/main/java/com/lmax/disruptor/RingBuffer.java",
"src/main/java/com/lmax/disruptor/util/Util.java",
"src/main/... | [] | diff --git a/src/test/java/com/lmax/disruptor/alternatives/MultiProducerSequencerUnsafe.java b/src/test/java/com/lmax/disruptor/alternatives/MultiProducerSequencerUnsafe.java
index 207293dff..e9d5548a5 100644
--- a/src/test/java/com/lmax/disruptor/alternatives/MultiProducerSequencerUnsafe.java
+++ b/src/test/java/com/l... | true | |
LMAX-Exchange/disruptor | 391 | issue_to_patch | Add OSGi headers to MANIFEST.MF
Apache Karaf (and other OSGi runtimes) that use log4j2 will need the lmax release to include the OSGi header data.
The bnd gradle plugin (v5.3.0) should have no problem auto-generating the correct headers, since the disruptor packaging is straightforward.
I'd create a PR, but am ... | Add OSGi headers to MANIFEST.MF | To resolve #380
The only outstanding task for this would be to add some kind of test that fails if the OSGi headers are missing/malformed.
I believe this can be done, but not sure how much time I want to spend reading about OSGi to figure out how to do it. | d36162745a484232d0606fece92564e687c7ca8e | 4ffa5726ef7bce8ae0cc568f65874ab29e9016a4 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5e332d91..2d7f770ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,6 @@
- Breaking Changes
- Minimum Java version now 11
- - Removed OSGI bundle fields from `MANIFEST.MF`
- Issue #323 - `WorkerPool` and `WorkProcessor` have been removed, no more ... | [
"CHANGELOG.md",
"build.gradle"
] | [] | true | |
LMAX-Exchange/disruptor | 375 | issue_to_patch | General improvements to the documentation | A PR for general improvements to the documentation.
So far:
- splitting out the examples so that we can prove they compile (spoilers: some previously didn't)
- highlighting important pieces of information using admonitions
- general rework of the "Using the Disruptor" section | db7a901bd25b87782b449d531b06395168becf63 | c19ff8ca30f8f9e56844ddaf82aff07097772ee1 | diff --git a/build.gradle b/build.gradle
index eabaaa1a1..00ef5e1da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,8 @@ plugins {
id 'checkstyle'
id 'idea'
id "io.github.reyerizo.gradle.jcstress" version "0.8.11"
- id 'org.asciidoctor.jvm.convert' version '3.1.0'
+ id 'org.asciidoctor.jv... | [
"build.gradle",
"config/checkstyle/suppress.xml",
"gradle/asciidoc.gradle",
"src/docs/asciidoc/en/disruptor.adoc",
"src/docs/asciidoc/en/index.adoc",
"src/docs/asciidoc/en/user-guide/10_using_the_disruptor.adoc",
"src/docs/asciidoc/en/user-guide/20_design_and_implementation.adoc",
"src/docs/asciidoc/e... | [] | true | ||
LMAX-Exchange/disruptor | 385 | issue_to_patch | Add javadocs to EventPoller and a related method | Documentation for EventPoller per #367
While updating the changelog I noticed that all the changes are listed under "Breaking changes." Perhaps you would like to separate out the breaking changes from the others? You could use 3 categories for breaking changes, deprecations, and the rest. | 8c3ba5cdb3ce455bed0dc6107846b5080bf8374b | e47124de878eecf19ca5499302f549a600542449 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9ea9b233..ac6e5249e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
- `Disruptor` constructors using Executor have been removed. Use ThreadFactory instead.
- FatalExceptionHandler and IgnoreExceptionHandler now use the JDK 9 Platform Logging API, ... | [
"CHANGELOG.md",
"src/main/java/com/lmax/disruptor/EventPoller.java",
"src/main/java/com/lmax/disruptor/Sequencer.java"
] | [
{
"comment": "unnecessary newline",
"path": "src/main/java/com/lmax/disruptor/EventPoller.java",
"hunk": "@@ -12,16 +15,57 @@\n private final Sequence sequence;\n private final Sequence gatingSequence;\n \n+ /**\n+ * A callback used to process events\n+ *\n+ * @param <T> the type ... | true | ||
LMAX-Exchange/disruptor | 385 | comment_to_fix | Add javadocs to EventPoller and a related method | unnecessary newline | 8c3ba5cdb3ce455bed0dc6107846b5080bf8374b | e47124de878eecf19ca5499302f549a600542449 | diff --git a/src/main/java/com/lmax/disruptor/EventPoller.java b/src/main/java/com/lmax/disruptor/EventPoller.java
index 0f55562e3..dc919c4f0 100644
--- a/src/main/java/com/lmax/disruptor/EventPoller.java
+++ b/src/main/java/com/lmax/disruptor/EventPoller.java
@@ -1,7 +1,10 @@
package com.lmax.disruptor;
/**
- * Ex... | [
"src/main/java/com/lmax/disruptor/EventPoller.java"
] | [
{
"comment": "unnecessary newline",
"path": "src/main/java/com/lmax/disruptor/EventPoller.java",
"hunk": "@@ -12,16 +15,57 @@\n private final Sequence sequence;\n private final Sequence gatingSequence;\n \n+ /**\n+ * A callback used to process events\n+ *\n+ * @param <T> the type ... | true | ||
LMAX-Exchange/disruptor | 385 | comment_to_fix | Add javadocs to EventPoller and a related method | unnecessary newline | 8c3ba5cdb3ce455bed0dc6107846b5080bf8374b | e47124de878eecf19ca5499302f549a600542449 | diff --git a/src/main/java/com/lmax/disruptor/EventPoller.java b/src/main/java/com/lmax/disruptor/EventPoller.java
index 0f55562e3..dc919c4f0 100644
--- a/src/main/java/com/lmax/disruptor/EventPoller.java
+++ b/src/main/java/com/lmax/disruptor/EventPoller.java
@@ -1,7 +1,10 @@
package com.lmax.disruptor;
/**
- * Ex... | [
"src/main/java/com/lmax/disruptor/EventPoller.java"
] | [
{
"comment": "unnecessary newline",
"path": "src/main/java/com/lmax/disruptor/EventPoller.java",
"hunk": "@@ -12,16 +15,57 @@\n private final Sequence sequence;\n private final Sequence gatingSequence;\n \n+ /**\n+ * A callback used to process events\n+ *\n+ * @param <T> the type ... | true | ||
LMAX-Exchange/disruptor | 385 | comment_to_fix | Add javadocs to EventPoller and a related method | unnecessary newline | 8c3ba5cdb3ce455bed0dc6107846b5080bf8374b | e47124de878eecf19ca5499302f549a600542449 | diff --git a/src/main/java/com/lmax/disruptor/EventPoller.java b/src/main/java/com/lmax/disruptor/EventPoller.java
index 0f55562e3..dc919c4f0 100644
--- a/src/main/java/com/lmax/disruptor/EventPoller.java
+++ b/src/main/java/com/lmax/disruptor/EventPoller.java
@@ -1,7 +1,10 @@
package com.lmax.disruptor;
/**
- * Ex... | [
"src/main/java/com/lmax/disruptor/EventPoller.java"
] | [
{
"comment": "unnecessary newline",
"path": "src/main/java/com/lmax/disruptor/EventPoller.java",
"hunk": "@@ -12,16 +15,57 @@\n private final Sequence sequence;\n private final Sequence gatingSequence;\n \n+ /**\n+ * A callback used to process events\n+ *\n+ * @param <T> the type ... | true | ||
LMAX-Exchange/disruptor | 386 | issue_to_patch | Fix siteUrl | The current URL (at github.com) only shows a 404 error.
While I was at it I switched the Apache Licence URL to HTTPS | a0db5e28564def3181ca747d44e2b1c3683ae951 | ac576a71dd8dc9756fc23c3a25e3e727c518775b | diff --git a/build.gradle b/build.gradle
index c11905bae..eabaaa1a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ ext {
fullName = 'Disruptor Framework'
fullDescription = 'Disruptor - Concurrent Programming Framework'
teamName = 'LMAX Disruptor Development Team'
- siteUrl = 'http://lm... | [
"build.gradle"
] | [] | true | ||
LMAX-Exchange/disruptor | 366 | issue_to_patch | Supply some missing javadoc commentary | Work towards https://github.com/LMAX-Exchange/disruptor/issues/365 | 8c3ba5cdb3ce455bed0dc6107846b5080bf8374b | 78dc17e921db1df6faaf194a0783cadbba271c69 | diff --git a/config/checkstyle/suppress.xml b/config/checkstyle/suppress.xml
index 0ac7a5b18..7a5fe0375 100644
--- a/config/checkstyle/suppress.xml
+++ b/config/checkstyle/suppress.xml
@@ -14,31 +14,10 @@
<suppress checks="MissingSwitchDefault"
files="(examples|jcstress|perf|jmh|test)[\\/].*"/>
- ... | [
"config/checkstyle/suppress.xml",
"src/main/java/com/lmax/disruptor/BatchStartAware.java",
"src/main/java/com/lmax/disruptor/DataProvider.java",
"src/main/java/com/lmax/disruptor/EventProcessor.java",
"src/main/java/com/lmax/disruptor/EventSequencer.java",
"src/main/java/com/lmax/disruptor/EventSink.java"... | [
{
"comment": "> Implementations should ideally return true only when the associated thread is idle\r\n\r\nI thought `isRunning` returns true only when the associated thread is _NOT_ idle?",
"path": "src/main/java/com/lmax/disruptor/EventProcessor.java",
"hunk": "@@ -38,5 +38,9 @@\n */\n void ha... | true | ||
LMAX-Exchange/disruptor | 366 | comment_to_fix | Supply some missing javadoc commentary | > Implementations should ideally return true only when the associated thread is idle
I thought `isRunning` returns true only when the associated thread is _NOT_ idle? | 8c3ba5cdb3ce455bed0dc6107846b5080bf8374b | 78dc17e921db1df6faaf194a0783cadbba271c69 | diff --git a/src/main/java/com/lmax/disruptor/EventProcessor.java b/src/main/java/com/lmax/disruptor/EventProcessor.java
index 5fcf20717..482ed3d88 100644
--- a/src/main/java/com/lmax/disruptor/EventProcessor.java
+++ b/src/main/java/com/lmax/disruptor/EventProcessor.java
@@ -38,5 +38,9 @@ public interface EventProcess... | [
"src/main/java/com/lmax/disruptor/EventProcessor.java"
] | [
{
"comment": "> Implementations should ideally return true only when the associated thread is idle\r\n\r\nI thought `isRunning` returns true only when the associated thread is _NOT_ idle?",
"path": "src/main/java/com/lmax/disruptor/EventProcessor.java",
"hunk": "@@ -38,5 +38,9 @@\n */\n void ha... | true | ||
LMAX-Exchange/disruptor | 373 | issue_to_patch | GHA: Perform "quick" jcstress run instead of "sanity" | I noticed that GHA workflow runs jcstress "sanity" mode as the commit-level check. "sanity" mode is really for jcstress infrastructure testing, as it spends almost no time in the tests themselves. If we want to run the fast testing that spend some time in test code, we are better off doing "quick" runs.
Downside: it... | ae5ba82361c53a764a7ffa7b0e73a7471970dd7b | 5e90e9d6238e1ca5a2dec3d0e066c218101cc25f | diff --git a/.github/workflows/jcstress-sanity.yml b/.github/workflows/jcstress-quick.yml
similarity index 80%
rename from .github/workflows/jcstress-sanity.yml
rename to .github/workflows/jcstress-quick.yml
index fa04c29d4..91393c758 100644
--- a/.github/workflows/jcstress-sanity.yml
+++ b/.github/workflows/jcstress-q... | [
".github/workflows/jcstress-quick.yml"
] | [] | true | ||
LMAX-Exchange/disruptor | 364 | issue_to_patch | Add rewind batch feature to the BatchEventProcessor. | When processing an event, if an exception is thrown that could be recoverable via outside influence. Throw a RewindableException that will replay all the events in the current batch. | d9e84d0aed5c0a6592f0a3759de6786c679ca16d | 3f9bc8fe1d4af04d0b01f8b0c374c1f3009c01d4 | diff --git a/src/docs/asciidoc/en/user-guide/40_batch_rewind_use_case.adoc b/src/docs/asciidoc/en/user-guide/40_batch_rewind_use_case.adoc
new file mode 100644
index 000000000..0685caea0
--- /dev/null
+++ b/src/docs/asciidoc/en/user-guide/40_batch_rewind_use_case.adoc
@@ -0,0 +1,62 @@
+= Batch Rewind
+
+:Author: LMAX D... | [
"src/docs/asciidoc/en/user-guide/40_batch_rewind_use_case.adoc",
"src/docs/asciidoc/en/user-guide/index.adoc",
"src/main/java/com/lmax/disruptor/BatchEventProcessor.java",
"src/main/java/com/lmax/disruptor/BatchRewindStrategy.java",
"src/main/java/com/lmax/disruptor/EventuallyGiveUpBatchRewindStrategy.java"... | [
{
"comment": "Checkstyle has been updated and requires final on all parameters",
"path": "src/main/java/com/lmax/disruptor/NanosecondRewindPauseStrategy.java",
"hunk": "@@ -0,0 +1,20 @@\n+package com.lmax.disruptor;\n+\n+import java.util.concurrent.locks.LockSupport;\n+\n+public class NanosecondRewindPa... | diff --git a/src/test/java/com/lmax/disruptor/RewindBatchEventProcessorTest.java b/src/test/java/com/lmax/disruptor/RewindBatchEventProcessorTest.java
new file mode 100644
index 000000000..323cc79d8
--- /dev/null
+++ b/src/test/java/com/lmax/disruptor/RewindBatchEventProcessorTest.java
@@ -0,0 +1,598 @@
+package com.lm... | true | |
LMAX-Exchange/disruptor | 364 | comment_to_fix | Add rewind batch feature to the BatchEventProcessor. | Checkstyle has been updated and requires final on all parameters | d9e84d0aed5c0a6592f0a3759de6786c679ca16d | 3f9bc8fe1d4af04d0b01f8b0c374c1f3009c01d4 | diff --git a/src/main/java/com/lmax/disruptor/RewindableException.java b/src/main/java/com/lmax/disruptor/RewindableException.java
new file mode 100644
index 000000000..2b5550cb3
--- /dev/null
+++ b/src/main/java/com/lmax/disruptor/RewindableException.java
@@ -0,0 +1,17 @@
+package com.lmax.disruptor;
+
+/**
+ * A spec... | [
"src/main/java/com/lmax/disruptor/RewindableException.java"
] | [
{
"comment": "Checkstyle has been updated and requires final on all parameters",
"path": "src/main/java/com/lmax/disruptor/RewindableException.java",
"hunk": "@@ -0,0 +1,9 @@\n+package com.lmax.disruptor;\n+\n+public class RewindableException extends RuntimeException\n+{\n+ public RewindableException... | true | ||
LMAX-Exchange/disruptor | 364 | comment_to_fix | Add rewind batch feature to the BatchEventProcessor. | In the event of a permanent exception, which may be classed as rewindable is there any idea how you're meant to track how many attempts it has at processing the batch?
Are you meant to encapsulate that in `RewindPauseStrategy::pause`?
I wonder if the `RewindableException e` should be passed to the pause strategy, a... | d9e84d0aed5c0a6592f0a3759de6786c679ca16d | 3f9bc8fe1d4af04d0b01f8b0c374c1f3009c01d4 | diff --git a/src/main/java/com/lmax/disruptor/BatchEventProcessor.java b/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
index b05ba58ac..9375e15e3 100644
--- a/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
+++ b/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
@@ -17,6 +17,8 @@
import... | [
"src/main/java/com/lmax/disruptor/BatchEventProcessor.java"
] | [
{
"comment": "In the event of a permanent exception, which may be classed as rewindable is there any idea how you're meant to track how many attempts it has at processing the batch?\r\n\r\nAre you meant to encapsulate that in `RewindPauseStrategy::pause`?\r\nI wonder if the `RewindableException e` should be pas... | true | ||
LMAX-Exchange/disruptor | 329 | issue_to_patch | Update Gradle wrapper to v6.5 | Update the Gradle wrapper to v6.5, and do the bare minimum* to get everything to still work.
*the bare minimum = remove the `osgi` plugin, because it no longer exists.
I'm not sure _why_ the OSGI plugin was required, although it does look as though someone wanted OSGI metadata in the past. It appears that the `... | e24ba7b3e9d3e7c832923dde54c9e9c9593fb5fa | 320a854a7f477ac3f3ba6bdbdac6ece4050a28d0 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcafcb565..74d008799 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
- Breaking Changes
- Minimum Java version now 11
+ - Removed OSGI bundle fields from `MANIFEST.MF`
- Issue #323 - `WorkerPool` and `WorkProcessor` have been removed, no more ... | [
"CHANGELOG.md",
"build.gradle",
"gradle/wrapper/gradle-wrapper.jar",
"gradle/wrapper/gradle-wrapper.properties",
"gradlew",
"gradlew.bat"
] | [] | true | ||
LMAX-Exchange/disruptor | 376 | issue_to_patch | [3.4] Logger instances are lazily initialized | 97f7973 is a clean cherry-pick, however the two ternary statements have been replaced with if/else in commit
5bd1b48 due to the limitations of java 8 generic type inference.
I did not include aa24297 in this PR because the v3.4 branch does not use jcstress. | 7045bfd12e0b009a6c822738e24659abb2ba0579 | 5bd1b48c87da1b58d4c99eec78978983e6a6d9f7 | diff --git a/src/main/java/com/lmax/disruptor/BatchEventProcessor.java b/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
index c2381389a..703d3fb45 100644
--- a/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
+++ b/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
@@ -35,7 +35,7 @@ public fi... | [
"src/main/java/com/lmax/disruptor/BatchEventProcessor.java",
"src/main/java/com/lmax/disruptor/ExceptionHandlers.java",
"src/main/java/com/lmax/disruptor/dsl/ExceptionHandlerWrapper.java"
] | [] | true | ||
LMAX-Exchange/disruptor | 371 | issue_to_patch | Fix #370: Logger instances are lazily initialized | Default java loggers are no longer initialized when custom
ExceptionHandler instances are provided. This allows logging
frameworks to delegate to disruptor without risking deadlocks.
Implementation notes:
This introduces a new public utility class `ExceptionHandlers` which exposes a singleton `ExceptionHandler<... | ae5ba82361c53a764a7ffa7b0e73a7471970dd7b | aa242973bedfd495352f82b48decfd69f703b82b | diff --git a/src/jcstress/java/com/lmax/disruptor/LoggerInitializationStress.java b/src/jcstress/java/com/lmax/disruptor/LoggerInitializationStress.java
new file mode 100644
index 000000000..ce4c86adb
--- /dev/null
+++ b/src/jcstress/java/com/lmax/disruptor/LoggerInitializationStress.java
@@ -0,0 +1,150 @@
+package com... | [
"src/jcstress/java/com/lmax/disruptor/LoggerInitializationStress.java",
"src/main/java/com/lmax/disruptor/BatchEventProcessor.java",
"src/main/java/com/lmax/disruptor/ExceptionHandlers.java",
"src/main/java/com/lmax/disruptor/dsl/ExceptionHandlerWrapper.java"
] | [] | true | ||
LMAX-Exchange/disruptor | 330 | issue_to_patch | Gradle refactoring | This is a follow-up to https://github.com/LMAX-Exchange/disruptor/pull/329 and contains all the changes in that PR plus some extra refactoring of the Gradle scripts.
I'm not sure if the suggested refactoring will be to everyone's tastes, so submitting these separately so it's slightly easier to review. If everyone i... | c3ea975904a1d3c93dc387c91ca81d1e4a78e727 | ce6f2e4ec3a816e6c0817ee2d8077193aa132c68 | diff --git a/build.gradle b/build.gradle
index 495402c1d..bccaa0cd6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,41 +14,20 @@
* limitations under the License.
*/
plugins {
- id 'java'
- id 'maven'
+ id 'java-library'
+ id 'maven-publish'
id 'signing'
- id 'eclipse' // Only used so the Ec... | [
"build.gradle",
"gradle/asciidoc.gradle",
"gradle/jmh.gradle",
"gradle/maven.gradle",
"gradle/perf.gradle"
] | [
{
"comment": "I think `-XDignore.symbol.file` might still be needed for now, but I'm less confident about the rest of this block.\r\nWarnings might be nice to see, gives us something to fix.\r\n\r\nFork and debug, what are they actually giving us here? Is it necessary?\r\n\r\nI think if anything stays living in... | true | ||
LMAX-Exchange/disruptor | 330 | comment_to_fix | Gradle refactoring | I think `-XDignore.symbol.file` might still be needed for now, but I'm less confident about the rest of this block.
Warnings might be nice to see, gives us something to fix.
Fork and debug, what are they actually giving us here? Is it necessary?
I think if anything stays living in here each line needs a comment ... | c3ea975904a1d3c93dc387c91ca81d1e4a78e727 | ce6f2e4ec3a816e6c0817ee2d8077193aa132c68 | diff --git a/build.gradle b/build.gradle
index 495402c1d..bccaa0cd6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,41 +14,20 @@
* limitations under the License.
*/
plugins {
- id 'java'
- id 'maven'
+ id 'java-library'
+ id 'maven-publish'
id 'signing'
- id 'eclipse' // Only used so the Ec... | [
"build.gradle"
] | [
{
"comment": "I think `-XDignore.symbol.file` might still be needed for now, but I'm less confident about the rest of this block.\r\nWarnings might be nice to see, gives us something to fix.\r\n\r\nFork and debug, what are they actually giving us here? Is it necessary?\r\n\r\nI think if anything stays living in... | true | ||
LMAX-Exchange/disruptor | 330 | comment_to_fix | Gradle refactoring | Can we not `/2` here? I have all these cores laying about, may as well use them? | c3ea975904a1d3c93dc387c91ca81d1e4a78e727 | ce6f2e4ec3a816e6c0817ee2d8077193aa132c68 | diff --git a/build.gradle b/build.gradle
index 495402c1d..bccaa0cd6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,41 +14,20 @@
* limitations under the License.
*/
plugins {
- id 'java'
- id 'maven'
+ id 'java-library'
+ id 'maven-publish'
id 'signing'
- id 'eclipse' // Only used so the Ec... | [
"build.gradle"
] | [
{
"comment": "Can we not `/2` here? I have all these cores laying about, may as well use them?",
"path": "build.gradle",
"hunk": "@@ -132,107 +90,13 @@ jar {\n 'Automatic-Module-Name': moduleName)\n }\n \n-task sourcesJar(type: Jar) {\n- classifier = 'sources'\n- from sourceSets.main.a... | true | ||
LMAX-Exchange/disruptor | 330 | comment_to_fix | Gradle refactoring | When I added this I didn't have the gradle-fu needed to make this some kind of value in `settings.gradle` as I'd originally intended for these def's.
Not sure if that's a "modern gradle" type thing to do, but hard coded defs in here was my quick hack and maybe now we could do better? | c3ea975904a1d3c93dc387c91ca81d1e4a78e727 | ce6f2e4ec3a816e6c0817ee2d8077193aa132c68 | diff --git a/gradle/jmh.gradle b/gradle/jmh.gradle
new file mode 100644
index 000000000..edc14601b
--- /dev/null
+++ b/gradle/jmh.gradle
@@ -0,0 +1,43 @@
+//
+// Configure JMH benchmarks
+//
+
+sourceSets {
+ jmh {
+ compileClasspath += sourceSets.main.output
+ runtimeClasspath += sourceSets.main.outpu... | [
"gradle/jmh.gradle"
] | [
{
"comment": "When I added this I didn't have the gradle-fu needed to make this some kind of value in `settings.gradle` as I'd originally intended for these def's.\r\nNot sure if that's a \"modern gradle\" type thing to do, but hard coded defs in here was my quick hack and maybe now we could do better?",
"p... | true | ||
LMAX-Exchange/disruptor | 343 | issue_to_patch | Tell Gradle to use the JUnit Platform runner | Currently, Gradle is attempting to run the `test` suite using the JUnit 4 platform; since everything was recently migrated to JUnit 5, none of the tests are found.
This PR fixes the problem :) | 41ff2be160134b809a9ff7a969090fdc76071b67 | 839bfeaa68fac3b81d1c10b2aebb9e2035d77544 | diff --git a/build.gradle b/build.gradle
index 59182fb5d..11751cc36 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,6 +64,10 @@ compileJava {
options.warnings = false
}
+test {
+ useJUnitPlatform()
+}
+
javadoc {
title = 'Disruptor'
| [
"build.gradle"
] | [] | true | ||
LMAX-Exchange/disruptor | 368 | issue_to_patch | Fix module-info module name | 565d30b968d72f4a3fae0bcb507de73eccf1de5f | 45d0e87eeba0512ffa5c149c136bc6d629628900 | diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 7cfd3512b..f5f8de746 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,7 +1,7 @@
-module disruptor.main {
+module com.lmax.disruptor {
requires jdk.unsupported; // Temporarily required for sum.mi... | [
"src/main/java/module-info.java"
] | [] | true | |||
LMAX-Exchange/disruptor | 362 | issue_to_patch | Use platform logging API in FatalExceptionHandler and IgnoreExceptionHandler | Changing from java.util.logging to the [Platform Logging API](https://openjdk.java.net/jeps/264) is preferable now that this library is targeting JDK 11.
* Removes the dependency on java.util.logging, which some modular applications may want to avoid.
* Both java.util.logging and System.Logger can be redirected to ... | 0acc7f03d430b9d082d16d2a2fbc077d4ab64641 | a0de4ccdb4183fa7782106e944bdc7feffe9a0ac | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fafe5186..2cfa80300 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
- Issue #323 - `WorkerPool` and `WorkProcessor` have been removed, no more `Disruptor::handleEventsWithWorkerPool`
- Deprecated ThreadHints.onSpinWait()
- `Disruptor` construct... | [
"CHANGELOG.md",
"src/main/java/com/lmax/disruptor/FatalExceptionHandler.java",
"src/main/java/com/lmax/disruptor/IgnoreExceptionHandler.java"
] | [
{
"comment": "Given the unknown complexity of `event::toString` I wonder if, on the `IgnoreExceptionHandler` at least, we should use the supplier variant of `LOGGER::log`?\r\nThen if using the ignore handler, and you have a log level higher above `INFO` it won't spend time building that string?",
"path": "s... | true | ||
LMAX-Exchange/disruptor | 362 | comment_to_fix | Use platform logging API in FatalExceptionHandler and IgnoreExceptionHandler | Given the unknown complexity of `event::toString` I wonder if, on the `IgnoreExceptionHandler` at least, we should use the supplier variant of `LOGGER::log`?
Then if using the ignore handler, and you have a log level higher above `INFO` it won't spend time building that string? | 0acc7f03d430b9d082d16d2a2fbc077d4ab64641 | a0de4ccdb4183fa7782106e944bdc7feffe9a0ac | diff --git a/src/main/java/com/lmax/disruptor/IgnoreExceptionHandler.java b/src/main/java/com/lmax/disruptor/IgnoreExceptionHandler.java
index fbabfb609..0cab19d5e 100644
--- a/src/main/java/com/lmax/disruptor/IgnoreExceptionHandler.java
+++ b/src/main/java/com/lmax/disruptor/IgnoreExceptionHandler.java
@@ -15,43 +15,3... | [
"src/main/java/com/lmax/disruptor/IgnoreExceptionHandler.java"
] | [
{
"comment": "Given the unknown complexity of `event::toString` I wonder if, on the `IgnoreExceptionHandler` at least, we should use the supplier variant of `LOGGER::log`?\r\nThen if using the ignore handler, and you have a log level higher above `INFO` it won't spend time building that string?",
"path": "s... | true | ||
LMAX-Exchange/disruptor | 356 | issue_to_patch | Increase MultiProducerSequencer performance on getting next sequence (master branch) | The MultiProducerSequencer currently has contention problems when many threads try to get the next sequence. It is not necessary to loop trying to compareAndSet the new sequence number. The producer can allocate sequence numbers upfront as long as it does not return when the consumer has not consumed the slot yet. The ... | d50135a6980d86a0d59d750036e86fe7be29c163 | 4bccfc40451daa83519fdce8ac4cb3a80f4ac62a | diff --git a/src/jmh/java/com/lmax/disruptor/MultiProducerSingleConsumer.java b/src/jmh/java/com/lmax/disruptor/MultiProducerSingleConsumer.java
new file mode 100644
index 000000000..51331013c
--- /dev/null
+++ b/src/jmh/java/com/lmax/disruptor/MultiProducerSingleConsumer.java
@@ -0,0 +1,74 @@
+package com.lmax.disrupt... | [
"src/jmh/java/com/lmax/disruptor/MultiProducerSingleConsumer.java",
"src/main/java/com/lmax/disruptor/MultiProducerSequencer.java",
"src/main/java/com/lmax/disruptor/Sequence.java",
"src/test/java/com/lmax/disruptor/RingBufferTest.java",
"src/test/java/com/lmax/disruptor/SequencerTest.java"
] | [] | diff --git a/src/test/java/com/lmax/disruptor/RingBufferTest.java b/src/test/java/com/lmax/disruptor/RingBufferTest.java
index d42f7a3e0..392cb7c40 100644
--- a/src/test/java/com/lmax/disruptor/RingBufferTest.java
+++ b/src/test/java/com/lmax/disruptor/RingBufferTest.java
@@ -186,7 +186,8 @@ public void shouldPreventPu... | true | |
LMAX-Exchange/disruptor | 360 | issue_to_patch | Add method to check if disruptor has been started | I have a use case where I want to check if Disruptor has already been started before calling start | 3b5ec74facb180b340ec0bd229cf3be3d715f28c | b558f03d1995880f2af9eb20107324971d6c4703 | diff --git a/src/main/java/com/lmax/disruptor/dsl/Disruptor.java b/src/main/java/com/lmax/disruptor/dsl/Disruptor.java
index 38df396e6..3aa8fe779 100644
--- a/src/main/java/com/lmax/disruptor/dsl/Disruptor.java
+++ b/src/main/java/com/lmax/disruptor/dsl/Disruptor.java
@@ -477,6 +477,16 @@ private boolean hasBacklog()
... | [
"src/main/java/com/lmax/disruptor/dsl/Disruptor.java",
"src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java"
] | [
{
"comment": "This test uses 2-space indentation while all other code in the codebase, and surrounding tests, use 4-space indentation",
"path": "src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java",
"hunk": "@@ -86,6 +86,21 @@ public void tearDown() throws Exception\n executor.joinAllThreads... | diff --git a/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java b/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
index 56c5a8551..21344d90a 100644
--- a/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
+++ b/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
@@ -54,6 +54,7 @@
import static or... | true | |
LMAX-Exchange/disruptor | 360 | comment_to_fix | Add method to check if disruptor has been started | This test uses 2-space indentation while all other code in the codebase, and surrounding tests, use 4-space indentation | 3b5ec74facb180b340ec0bd229cf3be3d715f28c | b558f03d1995880f2af9eb20107324971d6c4703 | diff --git a/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java b/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
index 56c5a8551..21344d90a 100644
--- a/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
+++ b/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
@@ -54,6 +54,7 @@
import static or... | [
"src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java"
] | [
{
"comment": "This test uses 2-space indentation while all other code in the codebase, and surrounding tests, use 4-space indentation",
"path": "src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java",
"hunk": "@@ -86,6 +86,21 @@ public void tearDown() throws Exception\n executor.joinAllThreads... | true | ||
LMAX-Exchange/disruptor | 360 | comment_to_fix | Add method to check if disruptor has been started | Using `if` and `fail` is an _interesting_ way of writing this test.
Would it not be simpler use `assertFalse(disruptor.hasStarted(), "Should only be set to started after start is called");`? | 3b5ec74facb180b340ec0bd229cf3be3d715f28c | b558f03d1995880f2af9eb20107324971d6c4703 | diff --git a/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java b/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
index 56c5a8551..21344d90a 100644
--- a/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
+++ b/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
@@ -54,6 +54,7 @@
import static or... | [
"src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java"
] | [
{
"comment": "Using `if` and `fail` is an _interesting_ way of writing this test.\r\n\r\nWould it not be simpler use `assertFalse(disruptor.hasStarted(), \"Should only be set to started after start is called\");`?",
"path": "src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java",
"hunk": "@@ -86,6 +86... | true | ||
LMAX-Exchange/disruptor | 360 | comment_to_fix | Add method to check if disruptor has been started | Using `if` and `fail` is an _interesting_ way of writing this test.
Would it not be simpler use `assertTrue(disruptor.hasStarted(), "Should be set to started after start is called");`? | 3b5ec74facb180b340ec0bd229cf3be3d715f28c | b558f03d1995880f2af9eb20107324971d6c4703 | diff --git a/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java b/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
index 56c5a8551..21344d90a 100644
--- a/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
+++ b/src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
@@ -54,6 +54,7 @@
import static or... | [
"src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java"
] | [
{
"comment": "Using `if` and `fail` is an _interesting_ way of writing this test.\r\n\r\nWould it not be simpler use `assertTrue(disruptor.hasStarted(), \"Should be set to started after start is called\");`?",
"path": "src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java",
"hunk": "@@ -86,6 +86,21 @@... | true | ||
LMAX-Exchange/disruptor | 361 | issue_to_patch | Update Badge links in readme | a8131b729d41351b4ad75ad69ac830c269442ac3 | d8b89cefd8db3f5018cc5f6a573617f8fda5a1c1 | diff --git a/README.md b/README.md
index 9bd10b495..3d7334fe6 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
## LMAX Disruptor
-
-![CodeQL](https://github.com/LMAX-Exchange/disruptor/workflows/Code... | [
"README.md"
] | [] | true | |||
LMAX-Exchange/disruptor | 353 | issue_to_patch | Change MultiProducerSequencer to use VarHandle instead of Unsafe | As part of moving towards JDK11 we should be removing uses of sun.misc.Unsafe
MultiProducerSequencer was using Unsafe to provide finer-grained concurrency controls around the availability array which we can replace with the newer VarHandle API.
While adding a JMH benchmark to try and compare the VarHandle version v... | d50135a6980d86a0d59d750036e86fe7be29c163 | 70b7d22846fb70e6f88cf472ff2e2185ed84574a | diff --git a/build.gradle b/build.gradle
index 6afc5e098..c89ce5bdd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,6 +21,7 @@ plugins {
id 'idea'
id "com.github.erizo.gradle.jcstress" version "0.8.6"
id 'org.asciidoctor.jvm.convert' version '3.1.0'
+ id 'me.champeau.gradle.jmh' version '0.5.3'
}... | [
"build.gradle",
"gradle/jmh.gradle",
"src/docs/asciidoc/en/user-guide/20_developing_the_disruptor.adoc",
"src/jcstress/java/com/lmax/disruptor/MultiProducerSequencerUnsafeStress.java",
"src/jcstress/java/com/lmax/disruptor/MultiProducerSequencerVarHandleStress.java",
"src/jmh/java/com/lmax/disruptor/Multi... | [] | diff --git a/src/test/java/com/lmax/disruptor/alternatives/MultiProducerSequencerUnsafe.java b/src/test/java/com/lmax/disruptor/alternatives/MultiProducerSequencerUnsafe.java
new file mode 100644
index 000000000..bad301d49
--- /dev/null
+++ b/src/test/java/com/lmax/disruptor/alternatives/MultiProducerSequencerUnsafe.ja... | true | |
LMAX-Exchange/disruptor | 352 | issue_to_patch | Move false-sharing padding to be in bytes rather than longs | To add to 4.0 work..
This is to make it work with JDK 15 memory layout changes.
see: https://shipilev.net/jvm/objects-inside-out/#_observation_hierarchy_tower_padding_trick_collapse_in_jdk_15
Should be harmless in earlier JDKs.
The changes save a bit of memory (up to 16 bytes on RingBuffer) by being able to f... | c21b13a3fcb85431c58406b61468713076f26889 | c7503c7c1d2619e389c94e1b22ea15c88159d450 | diff --git a/src/jmh/java/com/lmax/disruptor/RingBufferFalseSharingBenchmark.java b/src/jmh/java/com/lmax/disruptor/RingBufferFalseSharingBenchmark.java
new file mode 100644
index 000000000..07a506cf7
--- /dev/null
+++ b/src/jmh/java/com/lmax/disruptor/RingBufferFalseSharingBenchmark.java
@@ -0,0 +1,310 @@
+package com... | [
"src/jmh/java/com/lmax/disruptor/RingBufferFalseSharingBenchmark.java",
"src/main/java/com/lmax/disruptor/RingBuffer.java",
"src/main/java/com/lmax/disruptor/Sequence.java",
"src/main/java/com/lmax/disruptor/SingleProducerSequencer.java",
"src/test/java/com/lmax/disruptor/alternatives/SequenceUnsafe.java",
... | [] | diff --git a/src/test/java/com/lmax/disruptor/alternatives/SequenceUnsafe.java b/src/test/java/com/lmax/disruptor/alternatives/SequenceUnsafe.java
index 703630423..0b31a9ae3 100644
--- a/src/test/java/com/lmax/disruptor/alternatives/SequenceUnsafe.java
+++ b/src/test/java/com/lmax/disruptor/alternatives/SequenceUnsafe.... | true | |
LMAX-Exchange/disruptor | 351 | issue_to_patch | BatchEventProcessor#run - Java does have compareAndExchange | AtomicInteger#compareAndExchange is another method added in Java 9. | 73ec60d43d504bbbc0b57ec2abf87e7913740c57 | bb0df14002bb7933beaa86bdd0d97ea13015019c | diff --git a/src/main/java/com/lmax/disruptor/BatchEventProcessor.java b/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
index 7eedd4891..f93397a04 100644
--- a/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
+++ b/src/main/java/com/lmax/disruptor/BatchEventProcessor.java
@@ -113,7 +113,8 @@ public ... | [
"src/main/java/com/lmax/disruptor/BatchEventProcessor.java"
] | [] | true | ||
LMAX-Exchange/disruptor | 350 | issue_to_patch | Use Thread.onSpinWait() directly and deprecate ThreadHints method | Thread.onSpinWait() was added in Java 9.
I did not completely remove ThreadHints because semver says there should be "at least one minor release that contains the deprecation" before removal. ([ref](https://semver.org/#how-should-i-handle-deprecating-functionality)) | 20afb71ed00651196ad5f53d78a2a4c5925167f1 | fa24852db60a42d56f2e0d1546b1661a2eff7696 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1ef0d1b2..2fafe5186 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
- Minimum Java version now 11
- Removed OSGI bundle fields from `MANIFEST.MF`
- Issue #323 - `WorkerPool` and `WorkProcessor` have been removed, no more `Disruptor::handleEvent... | [
"CHANGELOG.md",
"src/main/java/com/lmax/disruptor/BlockingWaitStrategy.java",
"src/main/java/com/lmax/disruptor/BusySpinWaitStrategy.java",
"src/main/java/com/lmax/disruptor/LiteBlockingWaitStrategy.java",
"src/main/java/com/lmax/disruptor/util/ThreadHints.java"
] | [] | true | ||
LMAX-Exchange/disruptor | 349 | issue_to_patch | Remove Executor-based Disruptor constructors | The commit has breaking changes, which is why it is for 4.x | 72e11ff31301b63c8a2e6b42131c691352227440 | 37d9a0f1559285d7923eb6908145c251cf68d887 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74d008799..f1ef0d1b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
- Minimum Java version now 11
- Removed OSGI bundle fields from `MANIFEST.MF`
- Issue #323 - `WorkerPool` and `WorkProcessor` have been removed, no more `Disruptor::handleEvent... | [
"CHANGELOG.md",
"src/main/java/com/lmax/disruptor/dsl/BasicExecutor.java",
"src/main/java/com/lmax/disruptor/dsl/ConsumerInfo.java",
"src/main/java/com/lmax/disruptor/dsl/Disruptor.java",
"src/main/java/com/lmax/disruptor/dsl/EventProcessorInfo.java"
] | [] | true | ||
LMAX-Exchange/disruptor | 344 | issue_to_patch | Change Sequence to use VarHandles instead of Unsafe | As part of moving towards JDK11 we should be removing uses of `sun.misc.Unsafe`
One of the main uses is `Sequence` and we can replace use of `Unsafe` with the newer `VarHandle` API.
The other use of `Unsafe` is in the `RingBuffer` class, I have not touched that as part of this change. I think that requires its own ... | 8a4133c3ff83b860e488e1bc3d6cc3afaed22438 | 27605507539f49ebd8ec8cbf03a670660dd6b822 | diff --git a/gradle/jcstress.gradle b/gradle/jcstress.gradle
index b0b1fd4b7..db8769a04 100644
--- a/gradle/jcstress.gradle
+++ b/gradle/jcstress.gradle
@@ -1,3 +1,8 @@
+//
+// Configure JCStress
+//
+
jcstress {
+ includeTests = true
mode = project.getProperties().getOrDefault("mode", "default")
-}
\ No newli... | [
"gradle/jcstress.gradle",
"gradle/jmh.gradle",
"src/jcstress/java/com/lmax/disruptor/SequenceStressUnsafe.java",
"src/jcstress/java/com/lmax/disruptor/SequenceStressVarHandle.java",
"src/jcstress/java/com/lmax/disruptor/SequenceStressVarHandleBarrier.java",
"src/jmh/java/com/lmax/disruptor/SequenceBenchma... | [
{
"comment": "Is there any reason why you are not using `VarHandle::getAndAdd` instead?",
"path": "src/main/java/com/lmax/disruptor/Sequence.java",
"hunk": "@@ -112,55 +100,79 @@ public void set(final long value)\n */\n public void setVolatile(final long value)\n {\n- UNSAFE.putLongV... | diff --git a/src/test/java/com/lmax/disruptor/alternatives/SequenceDoublePadded.java b/src/test/java/com/lmax/disruptor/alternatives/SequenceDoublePadded.java
new file mode 100644
index 000000000..fae336441
--- /dev/null
+++ b/src/test/java/com/lmax/disruptor/alternatives/SequenceDoublePadded.java
@@ -0,0 +1,170 @@
+/*... | true | |
LMAX-Exchange/disruptor | 346 | issue_to_patch | CodeQL workflow | 8a4133c3ff83b860e488e1bc3d6cc3afaed22438 | f6fa8309116eda016816706eeb035ab0fa3065b4 | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 000000000..7f31ae5d1
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,72 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your r... | [
".github/workflows/codeql-analysis.yml"
] | [
{
"comment": "Might be nice to remove all the commented out bits from the default file and leave a comment explaining why we had to build manually instead of using the autobuild step",
"path": ".github/workflows/codeql-analysis.yml",
"hunk": "@@ -59,9 +59,16 @@ jobs:\n # and modify them (or add m... | true | |||
LMAX-Exchange/disruptor | 346 | comment_to_fix | CodeQL workflow | Might be nice to remove all the commented out bits from the default file and leave a comment explaining why we had to build manually instead of using the autobuild step | 8a4133c3ff83b860e488e1bc3d6cc3afaed22438 | f6fa8309116eda016816706eeb035ab0fa3065b4 | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 000000000..7f31ae5d1
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,72 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your r... | [
".github/workflows/codeql-analysis.yml"
] | [
{
"comment": "Might be nice to remove all the commented out bits from the default file and leave a comment explaining why we had to build manually instead of using the autobuild step",
"path": ".github/workflows/codeql-analysis.yml",
"hunk": "@@ -59,9 +59,16 @@ jobs:\n # and modify them (or add m... | true | ||
LMAX-Exchange/disruptor | 342 | issue_to_patch | JCStress test for Sequence | `Sequence` is a very important class to the Disruptor and it has methods like `set` and `setVolatile` which do subtly different things. It also makes general promises for thread safety/atomicity.
Given Sequence has existed for quite some time, this is less of an exercise in testing and more one of documenting existi... | 41ff2be160134b809a9ff7a969090fdc76071b67 | 46b80d14a030ed373e3614dd6076de18d9248aa7 | diff --git a/.github/workflows/jcstress-sanity.yml b/.github/workflows/jcstress-sanity.yml
new file mode 100644
index 000000000..fa04c29d4
--- /dev/null
+++ b/.github/workflows/jcstress-sanity.yml
@@ -0,0 +1,26 @@
+name: JCStress Testing - commit-level sanity check
+
+on: [ push, pull_request ]
+
+jobs:
+ build:
+ ... | [
".github/workflows/jcstress-sanity.yml",
".github/workflows/jcstress-stress.yml",
"build.gradle",
"gradle/jcstress.gradle",
"src/jcstress/java/com/lmax/disruptor/SequenceStress.java"
] | [] | true | ||
LMAX-Exchange/disruptor | 341 | issue_to_patch | Upload artifacts from GitHub Actions | We run a `gradle build` with GitHub Actions for CI but we were not exposing the reports generated by the build.
We also used to run the gradle build action on the master branch only, which meant any work on other branches was untested and could have gone all the way to merge request before flagging any issues. | 41ff2be160134b809a9ff7a969090fdc76071b67 | 750e1ee0e836b17231eb55385cfb562c9188fb2f | diff --git a/.github/workflows/ci.yml b/.github/workflows/gradle-build.yml
similarity index 68%
rename from .github/workflows/ci.yml
rename to .github/workflows/gradle-build.yml
index 693b17803..0bf745084 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/gradle-build.yml
@@ -1,10 +1,6 @@
name: Java CI with... | [
".github/workflows/gradle-build.yml"
] | [] | true | ||
LadybirdBrowser/ladybird | 10,092 | issue_to_patch | LibWeb: Hit testing improvements for SVG paths | See individual commits for details.
These changes allow the tooltip on the GitHub pulse page to appear.
From https://github.com/LadybirdBrowser/ladybird/pulse:
<img width="461" height="227" alt="image" src="https://github.com/user-attachments/assets/21510790-ac8f-4d71-bd4a-68865264f8ec" />
| f52852cd837355f219e9f7e57ff1b94e97805f9c | 39272aada8ae082eda9a61cb40190dc0bed03434 | diff --git a/Libraries/LibWeb/Painting/HitTestDisplayList.cpp b/Libraries/LibWeb/Painting/HitTestDisplayList.cpp
index 8fd282dbc51e2..05408ea1f0fec 100644
--- a/Libraries/LibWeb/Painting/HitTestDisplayList.cpp
+++ b/Libraries/LibWeb/Painting/HitTestDisplayList.cpp
@@ -204,6 +204,27 @@ void HitTestDisplayList::append_bo... | [
"Libraries/LibWeb/Painting/HitTestDisplayList.cpp",
"Libraries/LibWeb/Painting/HitTestDisplayList.h",
"Libraries/LibWeb/Painting/SVGPathPaintable.cpp",
"Tests/LibWeb/Text/expected/hit_testing/svg-fill-geometry.txt",
"Tests/LibWeb/Text/expected/wpt-import/css/cssom-view/elementsFromPoint.txt",
"Tests/LibWe... | [] | diff --git a/Tests/LibWeb/Text/expected/hit_testing/svg-fill-geometry.txt b/Tests/LibWeb/Text/expected/hit_testing/svg-fill-geometry.txt
new file mode 100644
index 0000000000000..375f42f090a48
--- /dev/null
+++ b/Tests/LibWeb/Text/expected/hit_testing/svg-fill-geometry.txt
@@ -0,0 +1,3 @@
+inside triangle fill: triangl... | true | |
LadybirdBrowser/ladybird | 10,096 | issue_to_patch | Selecting text leads to crash in has_style_or_parent_with_style
### Summary
When I open a pdf file, I would like to be able to select and copy text out of it. When I select text Ladybird crashes. The error message mentions something about navigation so I am wondering if it triggers some navigation "gesture". I can on... | LibWeb: Fix a crash when selecting across an element with no layout box | **Problem:** Crash when dragging a text selection across an element with no layout box (e.g., `display:contents`).
**Cause:** `set_user_selection()` looks for a `user-select:contain` ancestor by walking up the tree via two while-loop conditions that called `layout_node()->user_select_used_value()` for each element. ... | 6c13a3f37d790275c68ba98c86fa75fc35afd11f | 42e255807573c755cf4a888c95d3345f7141d641 | diff --git a/Libraries/LibWeb/Page/EventHandler.cpp b/Libraries/LibWeb/Page/EventHandler.cpp
index c069999f4217d..f330bc60b337c 100644
--- a/Libraries/LibWeb/Page/EventHandler.cpp
+++ b/Libraries/LibWeb/Page/EventHandler.cpp
@@ -1836,7 +1836,7 @@ static void set_user_selection(GC::Ptr<DOM::Node> anchor_node, size_t anc... | [
"Libraries/LibWeb/Page/EventHandler.cpp",
"Tests/LibWeb/Text/expected/selection-drag-across-display-contents.txt",
"Tests/LibWeb/Text/input/selection-drag-across-display-contents.html"
] | [] | diff --git a/Tests/LibWeb/Text/expected/selection-drag-across-display-contents.txt b/Tests/LibWeb/Text/expected/selection-drag-across-display-contents.txt
new file mode 100644
index 0000000000000..07d596f94b044
--- /dev/null
+++ b/Tests/LibWeb/Text/expected/selection-drag-across-display-contents.txt
@@ -0,0 +1,1 @@
+se... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.