Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add athena tables for affiliates/vaults. #2636

Merged
merged 4 commits into from
Dec 11, 2024

Conversation

vincentwschau
Copy link
Contributor

@vincentwschau vincentwschau commented Dec 10, 2024

Changelist

[Describe or list the changes made in this PR]

Test Plan

[Describe how this PR was tested (if applicable)]

Author/Reviewer Checklist

  • If this PR has changes that result in a different app state given the same prior state and transaction list, manually add the state-breaking label.
  • If the PR has breaking postgres changes to the indexer add the indexer-postgres-breaking label.
  • If this PR isn't state-breaking but has changes that modify behavior in PrepareProposal or ProcessProposal, manually add the label proposal-breaking.
  • If this PR is one of many that implement a specific feature, manually label them all feature:[feature-name].
  • If you wish to for mergify-bot to automatically create a PR to backport your change to a release branch, manually add the label backport/[branch-name].
  • Manually add any of the following labels: refactor, chore, bug.

Summary by CodeRabbit

  • New Features

    • Introduced new Athena tables for affiliate information, referred users, and vaults.
    • Added functionality to generate SQL statements for the new tables.
  • Bug Fixes

    • Enhanced error handling during the Athena table creation process.
  • Chores

    • Updated the task for managing the research environment to include new tables.

@vincentwschau vincentwschau requested a review from a team as a code owner December 10, 2024 16:37
Copy link
Contributor

coderabbitai bot commented Dec 10, 2024

Walkthrough

This pull request introduces three new TypeScript files: affiliate_info.ts, affiliate_referred_users.ts, and vaults.ts, each defining the structure and creation logic for corresponding Athena tables. Each file includes constants for table names and schemas, along with two exported functions to generate raw and standard Athena table creation statements. Additionally, the update-research-environment.ts file is modified to include these new tables in the tablesToAddToAthena object, ensuring their integration into the Athena query process.

Changes

File Change Summary
indexer/services/roundtable/src/lib/athena-ddl-tables/affiliate_info.ts Added affiliate_info.ts with functions generateRawTable and generateTable.
indexer/services/roundtable/src/lib/athena-ddl-tables/affiliate_referred_users.ts Added affiliate_referred_users.ts with functions generateRawTable and generateTable.
indexer/services/roundtable/src/lib/athena-ddl-tables/vaults.ts Added vaults.ts with functions generateRawTable and generateTable.
indexer/services/roundtable/src/tasks/update-research-environment.ts Updated tablesToAddToAthena to include new tables: affiliate_info, affiliate_referred_users, and vaults.

Possibly related PRs

  • [OTE-757] add update affiliate info roundtable #2233: This PR adds functionality to update affiliate information, which is directly related to the affiliate_info.ts file introduced in the main PR, as both involve managing affiliate data.
  • Split affiliate info fees by taker and maker #2439: This PR splits affiliate info fees by taker and maker, which aligns with the changes in the main PR that define the structure for affiliate information, including earnings and fees.
  • Allow configuring day vault PnL starts. #2570: This PR introduces a configuration for day vault PnL starts, which may relate to the overall management of financial data, including affiliate earnings, as seen in the main PR's focus on affiliate information.
  • Fix vaults PnL endpoint. #2612: This PR fixes the vaults PnL endpoint, which could be relevant as it deals with financial data management, similar to the affiliate information structure defined in the main PR.

Suggested labels

feature:indexer/affiliates

Suggested reviewers

  • Christopher-Li
  • dydxwill

🐰 In the land of code where rabbits hop,
New tables bloom, they never stop!
With Athena's grace, we craft and create,
Affiliate wonders, oh, isn't it great?
From vaults to info, all neatly aligned,
In the garden of code, new treasures we find! 🌼


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between f32f845 and dcbbbd0.

📒 Files selected for processing (1)
  • indexer/services/roundtable/src/lib/athena-ddl-tables/affiliate_info.ts (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • indexer/services/roundtable/src/lib/athena-ddl-tables/affiliate_info.ts

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Experiment)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 4

🧹 Outside diff range and nitpick comments (1)
indexer/services/roundtable/src/lib/athena-ddl-tables/affiliate_referred_users.ts (1)

19-26: Consider adding input validation for tablePrefix

The implementation looks good, but consider adding validation for the tablePrefix parameter to prevent any potential SQL injection, even though the helper functions likely handle this.

 export function generateRawTable(tablePrefix: string, rdsExportIdentifier: string): string {
+  if (!/^[a-zA-Z0-9_]+$/.test(tablePrefix)) {
+    throw new Error('Invalid table prefix');
+  }
   return getExternalAthenaTableCreationStatement(
     tablePrefix,
     rdsExportIdentifier,
     TABLE_NAME,
     RAW_TABLE_COLUMNS,
   );
 }

Also applies to: 28-34

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between fc5ff36 and 379e90e.

📒 Files selected for processing (4)
  • indexer/services/roundtable/src/lib/athena-ddl-tables/affiliate_info.ts (1 hunks)
  • indexer/services/roundtable/src/lib/athena-ddl-tables/affiliate_referred_users.ts (1 hunks)
  • indexer/services/roundtable/src/lib/athena-ddl-tables/vaults.ts (1 hunks)
  • indexer/services/roundtable/src/tasks/update-research-environment.ts (2 hunks)
🔇 Additional comments (4)
indexer/services/roundtable/src/lib/athena-ddl-tables/affiliate_referred_users.ts (1)

8-12: LGTM: Schema definition is clear and appropriate

The schema correctly captures the essential fields for tracking affiliate referrals with appropriate data types:

  • referredAddress and affiliateAddress as strings for blockchain addresses
  • referredAtBlock as bigint for block height reference
indexer/services/roundtable/src/lib/athena-ddl-tables/vaults.ts (1)

15-21: Verify status field constraints

The status field is defined as a string without any apparent constraints. Consider if this should be an enum type or have specific allowed values.

indexer/services/roundtable/src/tasks/update-research-environment.ts (2)

40-42: LGTM! Import statements are properly structured.

The new imports follow the existing pattern and maintain alphabetical ordering.


64-66: Verify the table definition files and schemas.

The table additions look good, but let's verify:

  1. The existence of the table definition files
  2. The proper implementation of generateRawTable and generateTable functions
  3. The correctness of the table schemas for the affiliate/vault feature
✅ Verification successful

The previous script confirmed the existence of all three table definition files and their generateRawTable and generateTable functions, but we need to examine the actual table schemas. This new script will help us verify the table definitions and their schemas.


Table definitions and schemas have been verified successfully

All three table definition files are properly implemented with:

  • Correct generateRawTable and generateTable functions
  • Well-defined schemas matching the affiliate/vault feature requirements:
    • affiliate_info: Tracks affiliate earnings, referred trades, and fee metrics
    • affiliate_referred_users: Maps referred addresses to affiliate addresses
    • vaults: Stores vault information with CLOB pair associations

The schemas include appropriate type casting (double for financial values, timestamp for dates) and all necessary columns for the feature.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the existence and implementation of the new table definition files

# Check if the table definition files exist
echo "Checking table definition files..."
for file in affiliate_info affiliate_referred_users vaults; do
  if [ -f "indexer/services/roundtable/src/lib/athena-ddl-tables/${file}.ts" ]; then
    echo "${file}.ts exists"
    
    # Check for required function implementations
    echo "Checking ${file}.ts implementation..."
    rg -A 1 "export function generate(Raw)?Table" "indexer/services/roundtable/src/lib/athena-ddl-tables/${file}.ts"
  else
    echo "${file}.ts not found"
  fi
done

# Check table schemas
echo -e "\nChecking table schemas..."
for file in affiliate_info affiliate_referred_users vaults; do
  echo "Schema for ${file}:"
  rg "CREATE TABLE" "indexer/services/roundtable/src/lib/athena-ddl-tables/${file}.ts" -A 10
done

Length of output: 2860


Script:

#!/bin/bash
# Let's try a different approach to check the table schemas

# Check the content of the table definition files
for file in affiliate_info affiliate_referred_users vaults; do
  echo "=== Content of ${file}.ts ==="
  cat "indexer/services/roundtable/src/lib/athena-ddl-tables/${file}.ts"
  echo -e "\n"
done

Length of output: 3751

@vincentwschau vincentwschau merged commit f95f663 into main Dec 11, 2024
16 checks passed
@vincentwschau vincentwschau deleted the vincentc/affiliate-athena-tables branch December 11, 2024 17:09
@vincentwschau
Copy link
Contributor Author

@Mergifyio backport release/indexer/v7.x

Copy link
Contributor

mergify bot commented Dec 11, 2024

backport release/indexer/v7.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Dec 11, 2024
vincentwschau added a commit that referenced this pull request Dec 11, 2024
@vincentwschau
Copy link
Contributor Author

@Mergifyio backport release/indexer/v8.x

Copy link
Contributor

mergify bot commented Dec 11, 2024

backport release/indexer/v8.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Dec 11, 2024
vincentwschau added a commit that referenced this pull request Dec 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

3 participants