You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by im...@apache.org on 2026/08/24 19:58:01 UTC

(asterixdb) 03/10: Merge branch 'gerrit/morpheus' into 'master'

This is an automated email from the ASF dual-hosted git repository.

parshimers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 234f00d042419317c89c36130d3864e705963d27
Merge: 335f0b82a5 5583ddc432
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Thu Aug 20 00:32:30 2026 -0400

    Merge branch 'gerrit/morpheus' into 'master'
    
     * [NO ISSUE][MISC] += CLAUDE.md (MB-68099)
    
    Conflict resolved in CLAUDE.md, which both branches added independently.
    This branch's file is the older, unwrapped one; the merged file is
    morpheus's, which is the same document rewrapped and carrying three
    sections this branch has not had: the note that a downstream extension's
    cross-Gerrit conventions live in the parent directory's instructions and
    are not auto-loaded from here, the subject convention with its Ext-ref
    and [BP] rules, and the Co-Authored-By requirement. The examples also
    name current models rather than CLAUDE_OPUS_4_8.
    
    This branch's own facts are put back: asterix-cloud and hyracks-cloud
    exist only here, so the module list keeps them, and the in-tree
    @AiProvenance usages are the union -- morpheus's Span, SpanTest and
    StringJsonParseEval, plus the S3Utils and S3TrustManagerProvider ones
    that are this branch's.
    
    Co-Authored-By: Claude Opus 5 <no...@anthropic.com>
    Change-Id: Ia6fe9f19343a5936dc946081896c3fcd8953a860
    Ext-ref: MB-68099

 CLAUDE.md | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 105 insertions(+), 22 deletions(-)

diff --cc CLAUDE.md
index 8ac01ee892,9675d2b18b..b0b52e872f
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@@ -18,13 -18,21 +18,22 @@@
   !-->
  # AsterixDB
  
- Apache AsterixDB — the BDMS query engine, storage layer, and Hyracks distributed runtime. See `README.md` for an overview.
+ Apache AsterixDB — the BDMS query engine, storage layer, and Hyracks distributed runtime. See
+ `README.md` for an overview.
  
  The tree has two roots:
 -- `asterixdb/` — the AsterixDB engine (SQL++ compiler, external data, storage).
 -- `hyracks-fullstack/` — the Hyracks runtime and shared utilities (`hyracks-util` etc.).
 +- `asterixdb/` — the AsterixDB engine (SQL++ compiler, external data, cloud, storage).
- - `hyracks-fullstack/` — the Hyracks runtime and shared utilities (`hyracks-util`, `hyracks-cloud`, etc.).
++- `hyracks-fullstack/` — the Hyracks runtime and shared utilities (`hyracks-util`,
++  `hyracks-cloud`, etc.).
  
- Files here carry the **Apache license header** (see `README.md`). Preserve it when editing or creating files.
+ Files here carry the **Apache license header** (see `README.md`). Preserve it when editing or
+ creating files.
+ 
+ This repository is also consumed by downstream extensions, which may check it out inside their own
+ source tree. Where that is so, the extension's own conventions — coordinating one change across two
+ Gerrit servers, the order in which such a set is landed, and mirroring merged commits to the fork
+ the extension actually builds from — live in the parent directory's instructions, which are **not**
+ auto-loaded from here. Read them before coordinating a change with an extension.
  
  ## Code Review
  
@@@ -76,7 -156,9 +157,11 @@@ If a model you used is missing from th
  
  ### Example
  
- In-tree usages include `asterixdb/asterix-external-data/.../aws/s3/S3Utils.java`, `asterixdb/asterix-cloud/.../S3TrustManagerProvider.java`, and `hyracks-fullstack/hyracks/hyracks-util/.../Span.java`.
+ In-tree usages on this branch include `hyracks-fullstack/hyracks/hyracks-util/.../Span.java`
 -(type-level, `REFACTORED`), `hyracks-fullstack/hyracks/hyracks-util/.../SpanTest.java`, and
 -`asterixdb/asterix-external-data/.../evaluators/StringJsonParseEval.java`.
++(type-level, `REFACTORED`), `hyracks-fullstack/hyracks/hyracks-util/.../SpanTest.java`,
++`asterixdb/asterix-external-data/.../evaluators/StringJsonParseEval.java`,
++`asterixdb/asterix-external-data/.../aws/s3/S3Utils.java` and
++`asterixdb/asterix-cloud/.../S3TrustManagerProvider.java`.
  
  ```java
  import org.apache.hyracks.util.annotations.AiProvenance;