Skip to content

Conversation

@GabeFernandez310
Copy link
Contributor

@GabeFernandez310 GabeFernandez310 commented Mar 9, 2023

Description

The yearweek(date [, mode]) function accepts a first argument representing a date, and an optional second argument containing a mode. It extract the year and week of the year from the input argument, and formats it as an integer which is returned. If an argument of type TIME is provided, the current date is used. The mode argument defines a set of rules to decide how to parse the year and week of the year and are based on MySQL.

Example:

opensearchsql> SELECT YEARWEEK('2020-08-26');
fetched rows / total rows = 1/1
+--------------------------+
| YEARWEEK('2020-08-26')   |
|--------------------------|
| 202034                   |
+--------------------------+
opensearchsql> SELECT YEARWEEK('2020-08-26', 0);
fetched rows / total rows = 1/1
+-----------------------------+
| YEARWEEK('2020-08-26', 0)   |
|-----------------------------|
| 202034                      |
+-----------------------------+

Issues Resolved

722

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

* Added Tests

Signed-off-by: GabeFernandez310 <[email protected]>

* Added Implementation

Signed-off-by: GabeFernandez310 <[email protected]>

* Fixed Implementation

Signed-off-by: GabeFernandez310 <[email protected]>

* Added Documentation

Signed-off-by: GabeFernandez310 <[email protected]>

* Fixed Tests

Signed-off-by: GabeFernandez310 <[email protected]>

* Addressed PR Comments

Signed-off-by: GabeFernandez310 <[email protected]>

* Cleaned YearweekTest File

Signed-off-by: GabeFernandez310 <[email protected]>

* Added Tests and Fixed Docs

Signed-off-by: GabeFernandez310 <[email protected]>

* Added And Modified Unit Tests

Signed-off-by: GabeFernandez310 <[email protected]>

* Fixed Jacoco In Core

Signed-off-by: GabeFernandez310 <[email protected]>

* Reworked convertWeekModeFromMySqlToJava Function

Signed-off-by: GabeFernandez310 <[email protected]>

* Refactored To Remove Extra Function

Signed-off-by: GabeFernandez310 <[email protected]>

---------

Signed-off-by: GabeFernandez310 <[email protected]>
@GabeFernandez310 GabeFernandez310 requested a review from a team as a code owner March 9, 2023 22:31
@codecov-commenter
Copy link

codecov-commenter commented Mar 9, 2023

Codecov Report

Merging #1417 (84884c8) into main (cd95bc5) will increase coverage by 0.00%.
The diff coverage is 100.00%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@            Coverage Diff            @@
##               main    #1417   +/-   ##
=========================================
  Coverage     98.38%   98.39%           
- Complexity     3693     3708   +15     
=========================================
  Files           343      343           
  Lines          9107     9148   +41     
  Branches        585      587    +2     
=========================================
+ Hits           8960     9001   +41     
  Misses          142      142           
  Partials          5        5           
Flag Coverage Δ
sql-engine 98.39% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...c/main/java/org/opensearch/sql/expression/DSL.java 100.00% <100.00%> (ø)
...arch/sql/expression/datetime/DateTimeFunction.java 100.00% <100.00%> (ø)
...h/sql/expression/function/BuiltinFunctionName.java 100.00% <100.00%> (ø)

... and 4 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

acarbonetto
acarbonetto previously approved these changes Mar 13, 2023
Copy link
Collaborator

@acarbonetto acarbonetto left a comment

Choose a reason for hiding this comment

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

LGTM

Yury-Fridlyand
Yury-Fridlyand previously approved these changes Mar 15, 2023
Signed-off-by: GabeFernandez310 <[email protected]>
@dai-chen dai-chen merged commit 03e4f97 into opensearch-project:main Mar 15, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1417-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 03e4f97b4f41074d9bf79584a36a56bf90ee221c
# Push it to GitHub
git push --set-upstream origin backport/backport-1417-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1417-to-2.x.

@Yury-Fridlyand
Copy link
Collaborator

@GabeFernandez310 please, backport manually

GabeFernandez310 added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Mar 16, 2023
* Add `YEARWEEK` Function To OpenSearch SQL

* Added Tests

Signed-off-by: GabeFernandez310 <[email protected]>

* Added Implementation

Signed-off-by: GabeFernandez310 <[email protected]>

* Fixed Implementation

Signed-off-by: GabeFernandez310 <[email protected]>

* Added Documentation

Signed-off-by: GabeFernandez310 <[email protected]>

* Fixed Tests

Signed-off-by: GabeFernandez310 <[email protected]>

* Addressed PR Comments

Signed-off-by: GabeFernandez310 <[email protected]>

* Cleaned YearweekTest File

Signed-off-by: GabeFernandez310 <[email protected]>

* Added Tests and Fixed Docs

Signed-off-by: GabeFernandez310 <[email protected]>

* Added And Modified Unit Tests

Signed-off-by: GabeFernandez310 <[email protected]>

* Fixed Jacoco In Core

Signed-off-by: GabeFernandez310 <[email protected]>

* Reworked convertWeekModeFromMySqlToJava Function

Signed-off-by: GabeFernandez310 <[email protected]>

* Refactored To Remove Extra Function

Signed-off-by: GabeFernandez310 <[email protected]>

---------

Signed-off-by: GabeFernandez310 <[email protected]>

* Fixed Magic Number

Signed-off-by: GabeFernandez310 <[email protected]>

---------

Signed-off-by: GabeFernandez310 <[email protected]>
(cherry picked from commit 03e4f97)
GabeFernandez310 added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Mar 16, 2023
* Add `YEARWEEK` Function To OpenSearch SQL

* Added Tests

Signed-off-by: GabeFernandez310 <[email protected]>

* Added Implementation

Signed-off-by: GabeFernandez310 <[email protected]>

* Fixed Implementation

Signed-off-by: GabeFernandez310 <[email protected]>

* Added Documentation

Signed-off-by: GabeFernandez310 <[email protected]>

* Fixed Tests

Signed-off-by: GabeFernandez310 <[email protected]>

* Addressed PR Comments

Signed-off-by: GabeFernandez310 <[email protected]>

* Cleaned YearweekTest File

Signed-off-by: GabeFernandez310 <[email protected]>

* Added Tests and Fixed Docs

Signed-off-by: GabeFernandez310 <[email protected]>

* Added And Modified Unit Tests

Signed-off-by: GabeFernandez310 <[email protected]>

* Fixed Jacoco In Core

Signed-off-by: GabeFernandez310 <[email protected]>

* Reworked convertWeekModeFromMySqlToJava Function

Signed-off-by: GabeFernandez310 <[email protected]>

* Refactored To Remove Extra Function

Signed-off-by: GabeFernandez310 <[email protected]>

---------

Signed-off-by: GabeFernandez310 <[email protected]>

* Fixed Magic Number

Signed-off-by: GabeFernandez310 <[email protected]>

---------

Signed-off-by: GabeFernandez310 <[email protected]>
(cherry picked from commit 03e4f97)
Yury-Fridlyand pushed a commit that referenced this pull request Mar 16, 2023
* Add `YEARWEEK` Function To OpenSearch SQL

* Added Tests

Signed-off-by: GabeFernandez310 <[email protected]>

* Added Implementation

Signed-off-by: GabeFernandez310 <[email protected]>

* Fixed Implementation

Signed-off-by: GabeFernandez310 <[email protected]>

* Added Documentation

Signed-off-by: GabeFernandez310 <[email protected]>

* Fixed Tests

Signed-off-by: GabeFernandez310 <[email protected]>

* Addressed PR Comments

Signed-off-by: GabeFernandez310 <[email protected]>

* Cleaned YearweekTest File

Signed-off-by: GabeFernandez310 <[email protected]>

* Added Tests and Fixed Docs

Signed-off-by: GabeFernandez310 <[email protected]>

* Added And Modified Unit Tests

Signed-off-by: GabeFernandez310 <[email protected]>

* Fixed Jacoco In Core

Signed-off-by: GabeFernandez310 <[email protected]>

* Reworked convertWeekModeFromMySqlToJava Function

Signed-off-by: GabeFernandez310 <[email protected]>

* Refactored To Remove Extra Function

Signed-off-by: GabeFernandez310 <[email protected]>

---------

Signed-off-by: GabeFernandez310 <[email protected]>

* Fixed Magic Number

Signed-off-by: GabeFernandez310 <[email protected]>

---------

Signed-off-by: GabeFernandez310 <[email protected]>
(cherry picked from commit 03e4f97)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants