Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -289,20 +289,20 @@ def validate(self) -> Testdrive:

$ set-regex match=(s\\d+|\\d{13}|[ ]{12}0|u\\d{1,3}|\\(\\d+-\\d\\d-\\d\\d\\s\\d\\d:\\d\\d:\\d\\d\\.\\d\\d\\d\\)|\\(\\d+\\)) replacement=<>

>[version<13900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_1
" query timestamp: <> <>\\n oracle read timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: false\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.refresh_view_late_1 (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n"
>[version>=13900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_1
>[version<2600900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_1
" query timestamp: <> <>\\n oracle read timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: false\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.refresh_view_late_1 (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n\\nbinding constraints:\\nlower:\\n (StorageInput([User<>])): [<> <>]\\n"
>[version>=2600900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_1
" query timestamp: <> <>\\n oracle read timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: false\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.refresh_view_late_1 (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n\\nbinding constraints:\\nlower:\\n (Storage inputs: [<>]): [<> <>]\\n"

>[version<13900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_2
" query timestamp: <> <>\\n oracle read timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: false\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.refresh_view_late_2 (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n"
>[version>=13900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_2
>[version<2600900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_2
" query timestamp: <> <>\\n oracle read timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: false\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.refresh_view_late_2 (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n\\nbinding constraints:\\nlower:\\n (StorageInput([User<>])): [<> <>]\\n"
>[version>=2600900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_2
" query timestamp: <> <>\\n oracle read timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: false\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.refresh_view_late_2 (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n\\nbinding constraints:\\nlower:\\n (Storage inputs: [<>]): [<> <>]\\n"

>[version<13900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_3
" query timestamp: <> <>\\n oracle read timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: false\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.refresh_view_late_3 (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n"
>[version>=13900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_3
>[version<2600900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_3
" query timestamp: <> <>\\n oracle read timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: false\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.refresh_view_late_3 (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n\\nbinding constraints:\\nlower:\\n (StorageInput([User<>])): [<> <>]\\n"
>[version>=2600900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_3
" query timestamp: <> <>\\n oracle read timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: false\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.refresh_view_late_3 (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n\\nbinding constraints:\\nlower:\\n (Storage inputs: [<>]): [<> <>]\\n"
"""
)
)
Expand Down
2 changes: 1 addition & 1 deletion misc/python/materialize/mzcompose/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def get_minimal_system_parameters(
# -----
# Others (ordered by name)
"allow_real_time_recency": "true",
"constraint_based_timestamp_selection": "verify",
Copy link
Contributor

Choose a reason for hiding this comment

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

We might want to keep this for older versions

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I've added it back.

"constraint_based_timestamp_selection": "verify", # removed from main, keeping it here for old versions
"enable_compute_peek_response_stash": "true",
"enable_0dt_deployment_panic_after_timeout": "true",
"enable_0dt_deployment_sources": (
Expand Down
1 change: 0 additions & 1 deletion misc/python/materialize/parallel_workload/action.py
Original file line number Diff line number Diff line change
Expand Up @@ -1603,7 +1603,6 @@ def __init__(
"enable_expression_cache",
"enable_multi_replica_sources",
"enable_password_auth",
"constraint_based_timestamp_selection",
"persist_fast_path_order",
"mz_metrics_lgalloc_map_refresh_interval",
"mz_metrics_lgalloc_refresh_interval",
Expand Down
9 changes: 0 additions & 9 deletions src/adapter-types/src/dyncfgs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ use std::time::Duration;

use mz_dyncfg::{Config, ConfigSet};

use crate::timestamp_selection::ConstraintBasedTimestampSelection;

pub const ALLOW_USER_SESSIONS: Config<bool> = Config::new(
"allow_user_sessions",
true,
Expand Down Expand Up @@ -119,12 +117,6 @@ pub const ENABLE_PASSWORD_AUTH: Config<bool> = Config::new(
"Enable password authentication.",
);

pub const CONSTRAINT_BASED_TIMESTAMP_SELECTION: Config<&'static str> = Config::new(
"constraint_based_timestamp_selection",
ConstraintBasedTimestampSelection::const_default().as_str(),
"Whether to use the constraint-based timestamp selection, one of: enabled, disabled, verify",
);

pub const PERSIST_FAST_PATH_ORDER: Config<bool> = Config::new(
"persist_fast_path_order",
false,
Expand All @@ -149,6 +141,5 @@ pub fn all_dyncfgs(configs: ConfigSet) -> ConfigSet {
.add(&ENABLE_EXPRESSION_CACHE)
.add(&ENABLE_MULTI_REPLICA_SOURCES)
.add(&ENABLE_PASSWORD_AUTH)
.add(&CONSTRAINT_BASED_TIMESTAMP_SELECTION)
.add(&PERSIST_FAST_PATH_ORDER)
}
1 change: 0 additions & 1 deletion src/adapter-types/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ pub mod compaction;
pub mod connection;
pub mod dyncfgs;
pub mod timestamp_oracle;
pub mod timestamp_selection;
51 changes: 0 additions & 51 deletions src/adapter-types/src/timestamp_selection.rs

This file was deleted.

Loading