fix(influxdb-v1): correct FUTURE LIMIT and PAST LIMIT clause order and add to ALTER RETENTION POLICY #6591

jstirnaman · 2025-12-04T23:13:32Z

Summary

Fix clause order: FUTURE LIMIT must appear before PAST LIMIT (parser requirement)
Add FUTURE LIMIT and PAST LIMIT clauses to ALTER RETENTION POLICY syntax documentation
Add grammar definitions for retention_future_limit and retention_past_limit
Add explicit note clarifying the required clause order
Clean up InfluxQL spec formatting (separate commit)

Files changed

Retention policy fixes

content/influxdb/v1/query_language/manage-database.md
content/enterprise_influxdb/v1/query_language/manage-database.md
content/influxdb/v1/query_language/spec.md
content/enterprise_influxdb/v1/query_language/spec.md

Test plan

Hugo build passes
Review rendered pages for correct syntax display

closes #6590

…d add to ALTER RETENTION POLICY - Fix clause order: FUTURE LIMIT must appear before PAST LIMIT (parser requirement) - Add FUTURE LIMIT and PAST LIMIT clauses to ALTER RETENTION POLICY syntax - Add grammar definitions for retention_future_limit and retention_past_limit - Add explicit note clarifying the required clause order - Fix "There are" style issue in spec.md closes #6590

influxdb/v1: - Simplify introduction and use relative anchor links - Convert notes to GitHub-style callout syntax - Fix heading hierarchy (Letters/digits, Identifiers, Keywords, Literals as h3) - Standardize Duration units table heading - Fix "keywords" typo - Reword "See FAQ" to "For more information, see" - Simplify KILL QUERY section - Fix SHOW MEASUREMENT CARDINALITY heading level - Replace "There are" with active voice enterprise_influxdb/v1: - Add related links to frontmatter - Simplify introduction and use relative anchor links - Convert notes to GitHub-style callout syntax - Add Characters and Letters/digits to TOC - Standardize Duration units table heading - Fix "keywords" typo - Reword "See FAQ" to "For more information, see" - Simplify KILL QUERY section for Enterprise clusters - Update SHOW TAG KEYS grammar to include with_key_clause - Remove backticks from SHOW STATS headings

jstirnaman · 2025-12-04T23:18:22Z

content/influxdb/v1/query_language/spec.md

 show_stats_stmt = "SHOW STATS [ FOR '<component>' | 'indexes' ]"
 ```

-#### `SHOW STATS`


Duplicate heading. I rearranged the content to be consistent with Ent.

jstirnaman · 2025-12-04T23:21:01Z

content/influxdb/v1/query_language/spec.md

- A multi-line comment begins with `/*` and ends with `*/`. This comment type can span several lines.
-  Multi-line comments do not support nested multi-line comments.
-
 ## Query Engine Internals


If you're looking for this in Ent., it has a separate Internals page.

davidby-influx

Unfortunately, we have discovered a bug in ALTER RETENTION POLICY so, although it accepts FUTURE LIMIT and PAST LIMIT it does not persist them correctly.

So, let me rescind my request to add the syntax to the documentation for 1.12.2, and we can add it on the 1.12.3 release.

For 1.12.2, we could add a note that they are, in fact, not changeable. I hope to have this fixed by 1.12.3.

Sorry for my confusion.

davidby-influx · 2025-12-05T19:20:50Z

content/enterprise_influxdb/v1/query_language/manage-database.md

 ### Modify retention policies with ALTER RETENTION POLICY

-The `ALTER RETENTION POLICY` query takes the following form, where you must declare at least one of the retention policy attributes `DURATION`, `REPLICATION`, `SHARD DURATION`, or `DEFAULT`:
+The `ALTER RETENTION POLICY` query takes the following form, where you must declare at least one of the retention policy attributes `DURATION`, `REPLICATION`, `SHARD DURATION`, `FUTURE LIMIT`, `PAST LIMIT`, or `DEFAULT`:


Let's revert this change to keep customers from using limits in ALTER statements

davidby-influx · 2025-12-05T19:23:28Z

content/enterprise_influxdb/v1/query_language/manage-database.md

+The `ALTER RETENTION POLICY` query takes the following form, where you must declare at least one of the retention policy attributes `DURATION`, `REPLICATION`, `SHARD DURATION`, `FUTURE LIMIT`, `PAST LIMIT`, or `DEFAULT`:
 ```sql
-ALTER RETENTION POLICY <retention_policy_name> ON <database_name> [DURATION <duration>] [REPLICATION <n>] [SHARD DURATION <duration>] [DEFAULT]
+ALTER RETENTION POLICY <retention_policy_name> ON <database_name> [DURATION <duration>] [REPLICATION <n>] [SHARD DURATION <duration>] [FUTURE LIMIT <duration>] [PAST LIMIT <duration>] [DEFAULT]


Please revert, as noted above. Perhaps we want to add a note that limits are not changeable (which note we can then remove in 1.12.3).

davidby-influx · 2025-12-05T19:23:51Z

content/enterprise_influxdb/v1/query_language/manage-database.md

 {{% /warn %}}

+For information about the `FUTURE LIMIT` and `PAST LIMIT` clauses, see
+[CREATE RETENTION POLICY](#create-retention-policies-with-create-retention-policy).


Remove for 1.12.2

davidby-influx · 2025-12-05T19:24:20Z

content/enterprise_influxdb/v1/query_language/spec.md

                               retention_policy_option
                               [ retention_policy_option ]
                               [ retention_policy_option ]
+                               [ retention_policy_option ]


Remove for 1.12.2

davidby-influx · 2025-12-05T19:24:32Z

content/enterprise_influxdb/v1/query_language/spec.md

 ALTER RETENTION POLICY "policy1" ON "somedb" DURATION 1h REPLICATION 4
+
+-- Change future and past limits.
+ALTER RETENTION POLICY "policy1" ON "somedb" FUTURE LIMIT 6h PAST LIMIT 6h


Remove for 1.12.2

davidby-influx · 2025-12-05T19:25:17Z

content/influxdb/v1/query_language/manage-database.md

 ### Modify retention policies with ALTER RETENTION POLICY

-The `ALTER RETENTION POLICY` query takes the following form, where you must declare at least one of the retention policy attributes `DURATION`, `REPLICATION`, `SHARD DURATION`, or `DEFAULT`:
+The `ALTER RETENTION POLICY` query takes the following form, where you must declare at least one of the retention policy attributes `DURATION`, `REPLICATION`, `SHARD DURATION`, `FUTURE LIMIT`, `PAST LIMIT`, or `DEFAULT`:


Revert for 1.12.2

davidby-influx · 2025-12-05T19:25:29Z

content/influxdb/v1/query_language/manage-database.md

+The `ALTER RETENTION POLICY` query takes the following form, where you must declare at least one of the retention policy attributes `DURATION`, `REPLICATION`, `SHARD DURATION`, `FUTURE LIMIT`, `PAST LIMIT`, or `DEFAULT`:
 ```sql
-ALTER RETENTION POLICY <retention_policy_name> ON <database_name> [DURATION <duration>] [REPLICATION <n>] [SHARD DURATION <duration>] [DEFAULT]
+ALTER RETENTION POLICY <retention_policy_name> ON <database_name> [DURATION <duration>] [REPLICATION <n>] [SHARD DURATION <duration>] [FUTURE LIMIT <duration>] [PAST LIMIT <duration>] [DEFAULT]


Revert for 1.12.2

davidby-influx · 2025-12-05T19:25:43Z

content/influxdb/v1/query_language/spec.md

                               retention_policy_option
                               [ retention_policy_option ]
                               [ retention_policy_option ]
+                               [ retention_policy_option ]


Remove for 1.12.2

davidby-influx · 2025-12-05T19:25:57Z

content/influxdb/v1/query_language/spec.md

 ALTER RETENTION POLICY "policy1" ON "somedb" DURATION 1h REPLICATION 4
+
+-- Change future and past limits.
+ALTER RETENTION POLICY "policy1" ON "somedb" FUTURE LIMIT 6h PAST LIMIT 6h


Remove for 1.12.2

davidby-influx · 2025-12-05T19:26:45Z

content/influxdb3/clustered/reference/release-notes/clustered.md

 Tables can now be renamed and undeleted with [influxctl v2.10.5](https://docs.influxdata.com/influxdb3/clustered/reference/release-notes/influxctl/#2105) or later.

-To enable hard delete of soft-deleted namespaces:
+To enable hard delete of soft-deleted databases:


I don't know anything about this.

jstirnaman added 2 commits December 4, 2025 15:37

jstirnaman requested review from davidby-influx and sanderson December 4, 2025 23:14

Merge branch 'master' into jts-fix-rp-limit-clauses

eaadc35

jstirnaman commented Dec 4, 2025

View reviewed changes

sanderson approved these changes Dec 5, 2025

View reviewed changes

davidby-influx requested changes Dec 5, 2025

View reviewed changes

davidby-influx mentioned this pull request Dec 8, 2025

CREATE RETENTION and ALTER RETENTION for V1 have errors around LIMIT clauses #6590

Open

jstirnaman mentioned this pull request Dec 10, 2025

FUTURE LIMIT and PAST LIMIT are not changeable in v1.12.2 #6606

Open

Copilot AI mentioned this pull request Dec 10, 2025

Add v1.12.2 limitation callout for PAST LIMIT and FUTURE LIMIT #6607

Draft

2 tasks

jstirnaman marked this pull request as draft December 10, 2025 16:49

jstirnaman added the hold off Should not be merged or address yet label Dec 10, 2025

jstirnaman added this to the v1.12.3 milestone Dec 10, 2025

fix(influxdb-v1): correct FUTURE LIMIT and PAST LIMIT clause order and add to ALTER RETENTION POLICY #6591

Are you sure you want to change the base?

fix(influxdb-v1): correct FUTURE LIMIT and PAST LIMIT clause order and add to ALTER RETENTION POLICY #6591

Uh oh!

Conversation

jstirnaman commented Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Files changed

Retention policy fixes

Test plan

Uh oh!

jstirnaman Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

davidby-influx left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jstirnaman commented Dec 4, 2025 •

edited

Loading

jstirnaman Dec 4, 2025 •

edited

Loading