Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 47 additions & 22 deletions .github/workflows/dev_pr.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,20 @@ module.exports = {
const title = context.payload.pull_request.title;
if (title.startsWith("MINOR: ")) {
console.log("PR is a minor PR");
return {"issue": null};
return {"issue": null, "type": "minor"};
}

const match = title.match(/^GH-([0-9]+): .*$/);
const match = title.match(/^(GH|DX)-([0-9]+): .*$/);
if (match === null) {
core.setFailed("Invalid PR title format. Must either be MINOR: or GH-NNN:");
return {"issue": null};
core.setFailed("Invalid PR title format. Must either be MINOR:, GH-NNN:, or DX-NNN:");
return {"issue": null, "type": null};
}
return {"issue": parseInt(match[1], 10)};

const issueType = match[1]; // "GH" or "DX"
const issueNumber = parseInt(match[2], 10);

console.log(`PR references ${issueType}-${issueNumber}`);
return {"issue": issueNumber, "type": issueType};
},

apply_labels: async function({core, github, context}) {
Expand Down Expand Up @@ -203,9 +208,28 @@ See [CONTRIBUTING.md](https://github.com/apache/arrow-java/blob/main/CONTRIBUTIN
console.log("This is a MINOR PR");
return;
}
const expected = `https://github.com/apache/arrow-java/issues/${issue.issue}`;

const query = `
// Handle Jira tickets (DX-NNN)
if (issue.type === "DX") {
const jiraUrl = `https://dremio.atlassian.net/browse/DX-${issue.issue}`;
console.log(`This PR references Jira ticket: ${jiraUrl}`);

// Add a comment with the Jira link
const comment_tag = "jira_link_comment";
const maybe_comment_id = await have_comment(github, context, context.payload.pull_request.number, comment_tag);
const body_text = `<!-- ${comment_tag} -->
**Related Jira Ticket:** [DX-${issue.issue}](${jiraUrl})`;

await upsert_comment(github, maybe_comment_id, body_text, true);
console.log("Added/updated Jira link comment");
return;
}

// Handle GitHub issues (GH-NNN)
if (issue.type === "GH") {
const expected = `https://github.com/apache/arrow-java/issues/${issue.issue}`;

const query = `
query($owner: String!, $name: String!, $number: Int!) {
repository(owner: $owner, name: $name) {
pullRequest(number: $number) {
Expand All @@ -220,22 +244,23 @@ query($owner: String!, $name: String!, $number: Int!) {
}
}`;

const result = await github.graphql(query, {
owner: context.repo.owner,
name: context.repo.repo,
number: context.payload.pull_request.number,
});
const issues = result.repository.pullRequest.closingIssuesReferences.edges;
console.log(issues);

for (const link of issues) {
console.log(`PR is linked to ${link.node.number}`);
if (link.node.number === issue.issue) {
console.log(`Found link to ${expected}`);
return;
const result = await github.graphql(query, {
owner: context.repo.owner,
name: context.repo.repo,
number: context.payload.pull_request.number,
});
const issues = result.repository.pullRequest.closingIssuesReferences.edges;
console.log(issues);

for (const link of issues) {
console.log(`PR is linked to ${link.node.number}`);
if (link.node.number === issue.issue) {
console.log(`Found link to ${expected}`);
return;
}
}
console.log(`Did not find link to ${expected}`);
core.setFailed("Missing link to issue in title");
}
console.log(`Did not find link to ${expected}`);
core.setFailed("Missing link to issue in title");
},
};
2 changes: 1 addition & 1 deletion ci/scripts/jni_macos_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ case "${vcpkg_arch}" in
arm64)
vcpkg_triplet="arm64-osx"
;;
i386|x86_64)
i386 | x86_64)
vcpkg_triplet="x64-osx"
;;
*)
Expand Down
26 changes: 13 additions & 13 deletions ci/scripts/jni_manylinux_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ set -euo pipefail
. "$(dirname "${0}")/util_log.sh"

github_actions_group_begin "Update llvm"
vcpkg install \
--debug \
--clean-after-build \
--x-install-root=${VCPKG_ROOT}/installed \
--x-manifest-root=/arrow/ci/vcpkg \
--overlay-ports=/arrow/ci/vcpkg/overlay/llvm/ \
--x-feature=dev \
--x-feature=flight \
--x-feature=gcs \
--x-feature=json \
--x-feature=parquet \
--x-feature=gandiva \
--x-feature=s3
vcpkg install \
--debug \
--clean-after-build \
--x-install-root=${VCPKG_ROOT}/installed \
--x-manifest-root=/arrow/ci/vcpkg \
--overlay-ports=/arrow/ci/vcpkg/overlay/llvm/ \
--x-feature=dev \
--x-feature=flight \
--x-feature=gcs \
--x-feature=json \
--x-feature=parquet \
--x-feature=gandiva \
--x-feature=s3
github_actions_group_end

github_actions_group_begin "Prepare arguments"
Expand Down
4 changes: 2 additions & 2 deletions vector/src/main/codegen/templates/UnionListWriter.java
Original file line number Diff line number Diff line change
Expand Up @@ -340,12 +340,12 @@ public void writeExtension(Object value) {
writer.writeExtension(value, extensionType);
writer.setPosition(writer.idx() + 1);
}

@Override
public void writeExtension(Object value, ArrowType type) {
writeExtension(value);
}

public void write(ExtensionHolder var1) {
writer.write(var1);
writer.setPosition(writer.idx() + 1);
Expand Down
Loading