-
Notifications
You must be signed in to change notification settings - Fork 127
Attempt to fix timestamp dialect difference for different catalog databases #654
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
Conversation
fbfe55b to
0ece568
Compare
|
Failed CI tests don't seem to related to my change: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
unittest is a Catch v2.13.7 host application.
Run with -? for options
-------------------------------------------------------------------------------
test/sql/default/default_expressions.test
-------------------------------------------------------------------------------
/duckdb_build_dir/duckdb/test/sqlite/test_sqllogictest.cpp:261
...............................................................................
test/sql/default/default_expressions.test:84: FAILED:
explicitly with message:
0
1. test/sql/default/default_expressions.test:84
================================================================================
Query unexpectedly succeeded! (test/sql/default/default_expressions.test:84)!
================================================================================
ALTER TABLE t_2 ADD COLUMN j INTEGER DEFAULT RANDOM();
================================================================================
Success
BOOLEAN
[ Rows: 0]
2. test/sql/concurrent/file_level_conflict.test:34
================================================================================
Query unexpectedly failed! (test/sql/concurrent/file_level_conflict.test:34)!
================================================================================
DELETE FROM ducklake.tbl WHERE key = 1;
================================================================================
TransactionContext Error: Failed to commit: Failed to commit DuckLake transaction.
Calling GetValueInternal on a value that is NULL
[146/257] (56%): test/sql/concurrent/file_level_conflict.test-------------------------------------------------------------------------------
test/sql/concurrent/file_level_conflict.test
-------------------------------------------------------------------------------
/duckdb_build_dir/duckdb/test/sqlite/test_sqllogictest.cpp:261
...............................................................................
test/sql/concurrent/file_level_conflict.test:34: FAILED:
explicitly with message:
0 |
|
Hey @dentity thanks for the PR. The main branch should be fixed now, can you merge with it? Also, can you remove the relevant sqlite tests being skipped from the CI tests? https://github.com/duckdb/ducklake/blob/main/test/configs/sqlite.json#L87 |
|
Instead of merging with latest main this could also go to V1.4 |
|
Tried to re-target against v1.4 branch, but found there's conflicts, just want to confirm I should include that as well? [~/ducklake] (hjiang/fix-timestamp-dilect)
vscode@9a5948bd4884$ git reset --hard v1.4-andium
HEAD is now at f50618b48c Fix #19455: correctly extract root table in merge into when running ajoin that contains single-sided predicates that are transformed into filters (#19637)
[~/ducklake] (hjiang/fix-timestamp-dilect)
vscode@9a5948bd4884$ git cherry-pick 0ece568ca90c59b6e34be0d5ec63ee66ce655a98
CONFLICT (modify/delete): src/functions/ducklake_cleanup_files.cpp deleted in HEAD and modified in 0ece568ca9 (Attempt to fix time dilect). Version 0ece568ca9 (Attempt to fix time dilect) of src/functions/ducklake_cleanup_files.cpp left in tree.
error: could not apply 0ece568ca9... Attempt to fix time dilect
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false" |
|
I'm a bit confused on how you are getting conflicts from your commit, since both |
e31ba5e to
d588ef6
Compare
I just realized my own fork v1.4 branch didn't sync upstream, should be good now |
|
Hi Pedro, I think I've rebased upon v1.4 branch, with two fixing commits in this PR. 1. test/sql/concurrent/file_level_conflict.test:34
================================================================================
Query unexpectedly failed! (test/sql/concurrent/file_level_conflict.test:34)!
================================================================================
DELETE FROM ducklake.tbl WHERE key = 17;
================================================================================
TransactionContext Error: Failed to commit: Failed to commit DuckLake transaction.
Calling GetValueInternal on a value that is NULL
[148/262] (56%): test/sql/concurrent/file_level_conflict.test
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
unittest is a Catch v2.13.7 host application.
Run with -? for options
-------------------------------------------------------------------------------
test/sql/concurrent/file_level_conflict.test
-------------------------------------------------------------------------------
/duckdb_build_dir/duckdb/test/sqlite/test_sqllogictest.cpp:261
...............................................................................
test/sql/concurrent/file_level_conflict.test:34: FAILED:
explicitly with message:
0 |
|
It seems that the CI is running on main, and this is an issue recently introduced in duckdb-main. Let me try to restart your CI. |
|
Thanks! |
I see people complain on crash #652.
Checking the source code,
ducklake/src/functions/ducklake_cleanup_files.cpp
Line 88 in 8c69c9d
ducklake is directly using
NOW() - INTERVAL <interval>syntax, which is not supported by sqliteThis PR converts deadline to ISO-8601 compatible string, which is acceptable for all existing databases (i.e., duckdb, sqlite, postgres).
How I tested