@@ -3,7 +3,6 @@ package com.parseable.android.ui.screens.logviewer
33import androidx.lifecycle.ViewModel
44import androidx.lifecycle.viewModelScope
55import com.parseable.android.data.escapeIdentifier
6−import com.parseable.android.data.escapeLikePattern
76import com.parseable.android.data.escapeSql
87import com.parseable.android.data.model.*
98import com.parseable.android.data.repository.ParseableRepository
@@ -16,13 +15,8 @@ import kotlinx.coroutines.flow.asStateFlow
1615import kotlinx.coroutines.flow.update
1716import kotlinx.coroutines.isActive
1817import kotlinx.coroutines.launch
19−import kotlinx.coroutines.sync.Mutex
20−import kotlinx.coroutines.sync.withLock
2118import kotlinx.serialization.json.JsonObject
2219import kotlinx.serialization.json.jsonPrimitive
23−import java.time.Instant
24−import java.time.LocalDateTime
25−import java.time.OffsetDateTime
2620import java.time.ZoneOffset
2721import java.time.ZonedDateTime
2822import java.time.format.DateTimeFormatter
@@ -40,21 +34,10 @@ enum class TimeRange(val label: String, val minutes: Long) {
4034 CUSTOM("Custom", 0),
4135}
4236
43−/** The original (column, operator, value) a filter chip was built from. */
44−data class FilterCondition(
45− val column: String,
46− val operator: String,
47− val value: String,
48−)
49−
5037data class FilterState(
5138 val searchQuery: String = "",
5239 val activeFilters: List<String> = emptyList(),
5340 val filterClauses: List<String> = emptyList(),
54− // Structured form of each chip, index-aligned with activeFilters/filterClauses.
55− // Kept so saved filters reconstruct from real values instead of re-parsing the
56− // human-readable display string (which is ambiguous when a value contains an operator).
57− val filterConditions: List<FilterCondition> = emptyList(),
5841 val customSql: String = "",
5942 val isSearching: Boolean = false,
6043)
@@ -89,10 +72,6 @@ data class LogViewerState(
8972 val hasMore: Boolean = false,
9073 val customStartTime: Long? = null,
9174 val customEndTime: Long? = null,
92− // Upper time bound (epoch millis) fixed at the first page of a paging session, so loadMore()
93− // doesn't slide a relative ("last N minutes") window forward as it re-queries. Null until the
94− // first refresh of a session; re-anchored whenever currentLimit resets to the initial page.
95− val pageAnchorTime: Long? = null,
9675) {
9776 // Convenience accessors for backward compatibility with Screen
9877 val searchQuery: String get() = filters.searchQuery
@@ -120,29 +99,13 @@ class LogViewerViewModel @Inject constructor(
12099 @Volatile private var streamingGeneration: Int = 0
121100 @Volatile private var lastSeenTimestamp: String? = null
122101 @Volatile private var consecutiveStreamingErrors: Int = 0
123− // True while the log list is scrolled to the top. New rows prepend at the top, so when the
124− // user is already there they see them live and the "+N new" badge must stay at 0. The badge
125− // only accumulates while the user is scrolled away, and resets when they return to the top.
126− @Volatile private var viewingTop: Boolean = true
127−
128− // Identities of rows already surfaced during the current streaming session. Used to dedupe
129− // re-fetched boundary rows. Kept INDEPENDENT of the displayed `logs` list — which is capped
130− // at STREAMING_MAX_LOGS — so that under sustained high-volume streaming, boundary rows
131− // evicted from the view are still recognized as duplicates and not prepended twice.
132− // Insertion-ordered so the oldest keys are trimmed first. Touched only from the single
133− // streaming coroutine and from startStreaming (which first cancels that coroutine).
134− private val seenStreamingKeys = LinkedHashSet<String>()
135102 private var searchJob: Job? = null
136103 private var schemaJob: Job? = null
137− private var refreshJob: Job? = null
138104
139105 companion object {
140106 private const val STREAMING_BASE_INTERVAL_MS = 3000L
141107 private const val STREAMING_MAX_INTERVAL_MS = 30000L
142108 private const val STREAMING_MAX_LOGS = 1000
143− // Remember more identities than the display cap so a row evicted from the view is still
144− // deduped on a later re-fetch. 2x the display cap covers the worst realistic overlap.
145− private const val SEEN_STREAMING_KEYS_MAX = STREAMING_MAX_LOGS * 2
146109 private const val MAX_LOAD_LIMIT = 5000
147110 private const val LOAD_MORE_INCREMENT = 500
148111 private const val MAX_STREAMING_ERRORS = 5
@@ -155,13 +118,10 @@ class LogViewerViewModel @Inject constructor(
155118 internal fun computeLogKeys(logs: List<JsonObject>): List<String> {
156119 val seen = mutableMapOf<String, Int>()
157120 return logs.map { log ->
158− // Key on the full row content (same identity used for streaming dedup, see
159− // logIdentity). Keying on only p_timestamp/p_metadata/p_tags collided for rows
160− // sharing those fields but differing in body, so the positional tiebreaker made
161− // keys shift when streaming prepended rows — corrupting expanded state and
162− // letting remember(stableKey) blocks render a stale body. The trailing counter
163− // only disambiguates genuinely identical rows, whose rendering is identical too.
164− val base = log.toString()
121+ val ts = log["p_timestamp"]?.toString()
122+ val meta = log["p_metadata"]?.toString()
123+ val tag = log["p_tags"]?.toString()
124+ val base = if (ts != null) "$ts|${meta.orEmpty()}|${tag.orEmpty()}" else log.hashCode().toString()
165125 val count = seen.getOrDefault(base, 0)
166126 seen[base] = count + 1
167127 if (count == 0) base else "$base|$count"
@@ -218,11 +178,7 @@ class LogViewerViewModel @Inject constructor(
218178 }
219179
220180 fun onSearchQueryChange(query: String) {
221− // A new query invalidates the live-tail baseline and the paged-up limit, matching
222− // the time-range / custom-SQL handlers.
223− stopStreaming()
224− // Searching returns to the filter-builder query path, so drop any active custom SQL.
225− _state.update { it.copy(currentLimit = 500, filters = it.filters.copy(searchQuery = query, customSql = "", isSearching = query.isNotBlank())) }
181+ _state.update { it.copy(filters = it.filters.copy(searchQuery = query, isSearching = query.isNotBlank())) }
226182 searchJob?.cancel()
227183 searchJob = viewModelScope.launch {
228184 delay(300)
@@ -231,17 +187,6 @@ class LogViewerViewModel @Inject constructor(
231187 }
232188 }
233189
234− /**
235− * Run the current search immediately (e.g. the IME "Search" action). Cancels the pending
236− * debounce so it can't fire a second, redundant refresh ~300ms later.
237− */
238− fun submitSearch() {
239− searchJob?.cancel()
240− _state.update { it.copy(filters = it.filters.copy(isSearching = false)) }
241− stopStreaming()
242− refresh()
243− }
244−
245190 fun addFilter(column: String, operator: String, value: String) {
246191 addFilterInternal(column, operator, value)
247192 refresh()
@@ -250,33 +195,21 @@ class LogViewerViewModel @Inject constructor(
250195 private fun addFilterInternal(column: String, operator: String, value: String) {
251196 if (operator !in ALLOWED_OPERATORS) return
252197 val safeColumn = escapeIdentifier(column)
198+ val safeValue = escapeSql(value)
253199 val clause = when (operator) {
254200 "IS NULL", "IS NOT NULL" -> "\"$safeColumn\" $operator"
255− // %/_ in the user's value must match literally, so escape the LIKE wildcards
256− // and declare the escape character. Exact comparisons keep %/_ verbatim.
257− "LIKE", "ILIKE" -> "\"$safeColumn\" $operator '%${escapeLikePattern(value)}%' ESCAPE '\\'"
258− else -> "\"$safeColumn\" $operator '${escapeSql(value)}'"
259− }
260− // IS NULL / IS NOT NULL ignore the value in both the clause and the display, so store
261− // an empty value in the structured condition too (keeps saved filters clean).
262− val conditionValue = when (operator) {
263− "IS NULL", "IS NOT NULL" -> ""
264− else -> value
201+ "LIKE", "ILIKE" -> "\"$safeColumn\" $operator '%$safeValue%'"
202+ else -> "\"$safeColumn\" $operator '$safeValue'"
265203 }
266204 val display = when (operator) {
267205 "IS NULL", "IS NOT NULL" -> "$column $operator"
268206 else -> "$column $operator $value"
269207 }
270− // A new filter invalidates the live-tail baseline and the paged-up limit.
271− stopStreaming()
272208 _state.update {
273209 it.copy(
274− currentLimit = 500,
275210 filters = it.filters.copy(
276211 filterClauses = it.filters.filterClauses + clause,
277212 activeFilters = it.filters.activeFilters + display,
278− filterConditions = it.filters.filterConditions + FilterCondition(column, operator, conditionValue),
279− customSql = "",
280213 ),
281214 )
282215 }
@@ -289,93 +222,81 @@ class LogViewerViewModel @Inject constructor(
289222 if (index >= 0 && index < it.filters.filterClauses.size) {
290223 removed = true
291224 it.copy(
292− currentLimit = 500,
293225 filters = it.filters.copy(
294226 activeFilters = it.filters.activeFilters.filterIndexed { i, _ -> i != index },
295227 filterClauses = it.filters.filterClauses.filterIndexed { i, _ -> i != index },
296− filterConditions = it.filters.filterConditions.filterIndexed { i, _ -> i != index },
297− customSql = "",
298228 ),
299229 )
300230 } else {
301231 it
302232 }
303233 }
304− if (removed) {
305− // A changed filter set invalidates the live-tail baseline.
306− stopStreaming()
307− refresh()
308− }
234+ if (removed) refresh()
309235 }
310236
311237 fun clearFilters() {
312− stopStreaming()
313238 _state.update {
314− it.copy(currentLimit = 500, filters = it.filters.copy(activeFilters = emptyList(), filterClauses = emptyList(), filterConditions = emptyList(), customSql = "", searchQuery = "", isSearching = false))
239+ it.copy(filters = it.filters.copy(activeFilters = emptyList(), filterClauses = emptyList()))
315240 }
316241 refresh()
317242 }
318243
319244 fun executeCustomSql(sql: String) {
320− // Custom SQL changes the query basis, so cancel any pending search debounce that would
321− // otherwise fire a redundant refresh() ~300ms later. (Unlike the filter/time-range
322− // handlers, this path doesn't route through stopStreaming().)
323− searchJob?.cancel()
324− // Drop a trailing statement terminator before we append anything — otherwise
325− // "SELECT * FROM x;" would become "SELECT * FROM x; LIMIT 5000", a syntax error.
326− val trimmed = sql.trim().trimEnd(';').trim()
245+ val trimmed = sql.trim()
327246 if (!trimmed.uppercase().startsWith("SELECT")) {
328247 _state.update { it.copy(error = "Only SELECT queries are allowed") }
329248 return
330249 }
331− // Enforce a LIMIT to prevent OOM from unbounded queries. Only honor a *top-level*
332− // `LIMIT <n>` (optionally with OFFSET) anchored at the end of the statement — a
333− // LIMIT inside a subquery doesn't bound the outer result set, so matching it
334− // anywhere would let an unbounded outer query slip past the safety limit. Anchoring
335− // at the end also means a string literal like 'LIMIT EXCEEDED' can't disable it.
336− val hasTopLevelLimit =
337− Regex("(?i)\\bLIMIT\\s+\\d+(\\s+OFFSET\\s+\\d+)?\\s*$").containsMatchIn(trimmed)
338− val safeSql = if (!hasTopLevelLimit) {
250+ // Enforce a LIMIT to prevent OOM from unbounded queries
251+ val safeSql = if (!trimmed.uppercase().contains("LIMIT")) {
339252 "$trimmed LIMIT $MAX_LOAD_LIMIT"
340253 } else {
341254 trimmed
342255 }
343− // Store the custom SQL and let refresh() run it. Keeping it in state means
344− // pull-to-refresh / time-range changes re-run the custom query instead of
345− // silently replacing it with the default filter query.
346256 _state.update { it.copy(filters = it.filters.copy(customSql = safeSql), currentLimit = 500) }
347− refresh()
257+ viewModelScope.launch {
258+ _state.update { it.copy(isLoading = true, error = null) }
259+
260+ val (startTime, endTime) = getTimeRange()
261+ when (val result = repository.queryLogsRaw(safeSql, startTime, endTime)) {
262+ is ApiResult.Success -> {
263+ val keys = computeLogKeys(result.data)
264+ _state.update {
265+ it.copy(
266+ logs = result.data,
267+ logKeys = keys,
268+ isLoading = false,
269+ hasMore = result.data.size >= it.currentLimit,
270+ )
271+ }
272+ }
273+ is ApiResult.Error -> {
274+ _state.update {
275+ it.copy(isLoading = false, error = result.userMessage)
276+ }
277+ }
278+ }
279+ }
348280 }
349281
350282 private fun buildSearchClause(searchableColumns: List<String>, searchQuery: String): String? {
351283 if (searchQuery.isBlank()) return null
352284 if (searchableColumns.isEmpty()) return null
353− val safeSearch = escapeLikePattern(searchQuery)
285+ val safeSearch = escapeSql(searchQuery)
354286 return searchableColumns.joinToString(" OR ") {
355− "CAST(\"${escapeIdentifier(it)}\" AS VARCHAR) ILIKE '%$safeSearch%' ESCAPE '\\'"
287+ "CAST(\"${escapeIdentifier(it)}\" AS VARCHAR) ILIKE '%$safeSearch%'"
356288 }
357289 }
358290
359291 fun refresh() {
360292 if (_state.value.streamName.isEmpty()) return
361293
362− // Cancel any in-flight query so out-of-order completions can't overwrite
363− // fresh results with stale ones (filter/search/time-range/loadMore all call refresh()).
364− refreshJob?.cancel()
365− refreshJob = viewModelScope.launch {
366− // Anchor the upper time bound on the first page of a paging session (currentLimit at
367− // its initial value) and reuse it for subsequent loadMore() pages. Otherwise a relative
368− // range would recompute "now" on every page in getTimeRange(), sliding the window and
369− // duplicating/dropping rows on an actively-ingesting stream.
370− val anchor = _state.value.let { s ->
371− if (s.currentLimit <= 500) System.currentTimeMillis() else s.pageAnchorTime
372− }
294+ viewModelScope.launch {
373295 _state.update {
374296 it.copy(
375297 isLoading = true,
376298 error = null,
377299 streaming = it.streaming.copy(streamingError = null),
378− pageAnchorTime = anchor,
379300 )
380301 }
381302
@@ -383,20 +304,6 @@ class LogViewerViewModel @Inject constructor(
383304 val current = _state.value
384305 val (startTime, endTime) = getTimeRange()
385306
386− // A custom SQL query owns the whole statement (its own LIMIT, columns, ordering),
387− // so re-run it verbatim. It is not paginated via loadMore(), hence hasMore = false.
388− if (current.filters.customSql.isNotBlank()) {
389− when (val result = repository.queryLogsRaw(current.filters.customSql, startTime, endTime)) {
390− is ApiResult.Success -> {
391− _state.update { it.copy(logs = result.data, logKeys = computeLogKeys(result.data), isLoading = false, hasMore = false) }
392− }
393− is ApiResult.Error -> {
394− _state.update { it.copy(isLoading = false, error = result.userMessage) }
395− }
396− }
397− return@launch
398− }
399−
400307 // Build WHERE clause from filters + search
401308 val clauses = current.filters.filterClauses.toMutableList()
402309 if (current.filters.searchQuery.isNotBlank()) {
@@ -413,26 +320,22 @@ class LogViewerViewModel @Inject constructor(
413320
414321 val filterSql = clauses.joinToString(" AND ")
415322
416− // Over-fetch by one row so we can distinguish "exactly currentLimit rows exist"
417− // (no more pages) from "the page is full and more may exist" without firing a
418− // wasted extra query the next time the user scrolls to the bottom.
419− val requestLimit = current.currentLimit + 1
420323 when (val result = repository.queryLogs(
421324 stream = current.streamName,
422325 startTime = startTime,
423326 endTime = endTime,
424327 filterSql = filterSql,
425− limit = requestLimit,
328+ limit = current.currentLimit,
426329 )) {
427330 is ApiResult.Success -> {
428− val hasMore = result.data.size > current.currentLimit && current.currentLimit < MAX_LOAD_LIMIT
429− val logs = if (result.data.size > current.currentLimit) {
430− result.data.take(current.currentLimit)
431− } else {
432− result.data
433− }
331+ val keys = computeLogKeys(result.data)
434332 _state.update {
435− it.copy(logs = logs, logKeys = computeLogKeys(logs), isLoading = false, hasMore = hasMore)
333+ it.copy(
334+ logs = result.data,
335+ logKeys = keys,
336+ isLoading = false,
337+ hasMore = result.data.size >= it.currentLimit,
338+ )
436339 }
437340 }
438341 is ApiResult.Error -> {
@@ -444,29 +347,8 @@ class LogViewerViewModel @Inject constructor(
444347 }
445348 }
446349
447− /**
448− * Pull-to-refresh: restart the paging session from the first page. Resetting currentLimit
449− * makes refresh() re-anchor pageAnchorTime to "now", so a relative time range advances and
450− * newly-ingested rows appear. Calling refresh() alone keeps the frozen anchor once the user
451− * has paged past the first page, making pull-to-refresh look like it does nothing.
452− */
453− fun pullRefresh() {
454− if (_state.value.streamName.isEmpty()) return
455− // While live-tailing, the poller continuously prepends fresh rows; a concurrent refresh()
456− // would replace the list with a full page at the same time, racing the poller on logs/
457− // logKeys/streamingError and producing duplicated or dropped rows plus a stale "+N" badge.
458− // The displayed logs are already current under streaming, so the pull is a no-op here —
459− // mirror loadMore()'s guard rather than the stopStreaming() path the other mutators take.
460− if (_state.value.streaming.isStreaming) return
461− _state.update { it.copy(currentLimit = 500) }
462− refresh()
463− }
464−
465350 fun loadMore() {
466351 val current = _state.value
467− // While live-tailing, logs are prepended in memory; a refresh() here would replace
468− // them with a fresh page and drop the streamed rows. Pagination resumes once stopped.
469− if (current.streaming.isStreaming) return
470352 if (current.currentLimit >= MAX_LOAD_LIMIT) {
471353 _state.update { it.copy(hasMore = false) }
472354 return
@@ -489,9 +371,7 @@ class LogViewerViewModel @Inject constructor(
489371 )
490372 return Pair(start.format(dateFormatter), end.format(dateFormatter))
491373 }
492− val now = current.pageAnchorTime
493− ?.let { ZonedDateTime.ofInstant(java.time.Instant.ofEpochMilli(it), ZoneOffset.UTC) }
494− ?: ZonedDateTime.now(ZoneOffset.UTC)
374+ val now = ZonedDateTime.now(ZoneOffset.UTC)
495375 val start = now.minusMinutes(current.selectedTimeRange.minutes)
496376 return Pair(
497377 start.format(dateFormatter),
@@ -499,17 +379,6 @@ class LogViewerViewModel @Inject constructor(
499379 )
500380 }
501381
502− /**
503− * Report whether the log list is scrolled to the top. Clears the "+N new" streaming badge
504− * when the user returns to the top, since prepended rows there are seen immediately.
505− */
506− fun setViewingTop(atTop: Boolean) {
507− viewingTop = atTop
508− if (atTop && _state.value.streaming.streamingNewCount != 0) {
509− _state.update { it.copy(streaming = it.streaming.copy(streamingNewCount = 0)) }
510− }
511− }
512−
513382 fun toggleStreaming() {
514383 if (_state.value.streaming.isStreaming) {
515384 stopStreaming()
@@ -519,10 +388,6 @@ class LogViewerViewModel @Inject constructor(
519388 }
520389
521390 private fun startStreaming() {
522− // The poller builds its own default SELECT * query and cannot honor a custom SQL
523− // projection/filter, so streaming custom-query results would prepend mismatched rows.
524− // The UI disables the toggle in this state; guard here too in case it's reached anyway.
525− if (_state.value.filters.customSql.isNotBlank()) return
526391 stopStreaming()
527392 consecutiveStreamingErrors = 0
528393 val generation = ++streamingGeneration
@@ -530,12 +395,6 @@ class LogViewerViewModel @Inject constructor(
530395 it.copy(streaming = StreamingState(isStreaming = true, streamingNewCount = 0))
531396 }
532397
533− // Seed the dedup set with the rows already on screen so an initial row sitting exactly
534− // on the streaming baseline timestamp can't be re-fetched and duplicated.
535− seenStreamingKeys.clear()
536− _state.value.logs.forEach { seenStreamingKeys.add(logIdentity(it)) }
537− trimSeenStreamingKeys()
538−
539398 // Set the baseline timestamp to "now" so we only poll for new logs
540399 lastSeenTimestamp = ZonedDateTime.now(ZoneOffset.UTC).format(dateFormatter)
541400
@@ -558,13 +417,6 @@ class LogViewerViewModel @Inject constructor(
558417 }
559418
560419 fun stopStreaming() {
561− // Cancel any pending search debounce too. Every query-basis change (time range, filters,
562− // saved filter, clear, new search) routes through stopStreaming(); without this, a
563− // searchJob scheduled moments before such a change would still fire refresh() ~300ms
564− // later and redundantly re-query over the just-applied state. onSearchQueryChange()
565− // re-assigns searchJob immediately after calling stopStreaming(), so its own debounce
566− // survives.
567− searchJob?.cancel()
568420 streamingGeneration++
569421 streamingJob?.cancel()
570422 streamingJob = null
@@ -579,49 +431,6 @@ class LogViewerViewModel @Inject constructor(
579431 }
580432 }
581433
582− /**
583− * Content-based identity for a log row, used to dedupe re-fetched boundary logs.
584− * Uses the full row: two rows are duplicates only when every field matches, so
585− * distinct logs that happen to share a timestamp/metadata/tags are not dropped.
586− */
587− private fun logIdentity(log: JsonObject): String = log.toString()
588−
589− /**
590− * Parse a server-rendered p_timestamp (which may be ISO with 'Z', offset-carrying,
591− * space-separated, or offset-less UTC) and reformat it to the canonical query format
592− * (`dateFormatter`) so it's a valid inclusive startTime for the next poll. Returns null
593− * if the value can't be parsed, so the caller can keep the previous boundary.
594− */
595− private fun normalizeBoundaryTimestamp(raw: String): String? {
596− val isoLike = if (' ' in raw && 'T' !in raw) raw.replaceFirst(' ', 'T') else raw
597− val instant = try {
598− Instant.parse(isoLike)
599− } catch (_: Exception) {
600− try {
601− OffsetDateTime.parse(isoLike).toInstant()
602− } catch (_: Exception) {
603− try {
604− LocalDateTime.parse(isoLike).toInstant(ZoneOffset.UTC)
605− } catch (_: Exception) {
606− return null
607− }
608− }
609− }
610− return instant.atOffset(ZoneOffset.UTC).format(dateFormatter)
611− }
612−
613− /** Bound the dedup set, evicting the oldest identities first (insertion order). */
614− private fun trimSeenStreamingKeys() {
615− if (seenStreamingKeys.size <= SEEN_STREAMING_KEYS_MAX) return
616− val iterator = seenStreamingKeys.iterator()
617− var toRemove = seenStreamingKeys.size - SEEN_STREAMING_KEYS_MAX
618− while (toRemove > 0 && iterator.hasNext()) {
619− iterator.next()
620− iterator.remove()
621− toRemove--
622− }
623− }
624−
625434 private suspend fun pollNewLogs() {
626435 val current = _state.value
627436 if (current.streamName.isEmpty()) return
@@ -634,116 +443,45 @@ class LogViewerViewModel @Inject constructor(
634443 if (current.filters.searchQuery.isNotBlank()) {
635444 val searchClause = buildSearchClause(current.searchableColumns, current.filters.searchQuery)
636445 if (searchClause != null) {
637− // Parenthesize: the search clause is OR-joined and must not break the
638− // precedence of the AND-joined filter clauses around it.
639446 clauses.add("($searchClause)")
640− } else {
641− // Schema not loaded yet, so we can't build the search filter. Skip this
642− // poll rather than querying without it — otherwise we'd prepend rows that
643− // don't match the active search into a filtered view. Mirrors refresh(),
644− // which errors out instead of running an unfiltered query.
645− _state.update {
646− it.copy(
647− streaming = it.streaming.copy(
648− streamingError = "Search unavailable: stream schema not loaded",
649− ),
650− )
651− }
652− return
653447 }
654448 }
655449
656450 val whereClause = if (clauses.isNotEmpty()) " WHERE ${clauses.joinToString(" AND ")}" else ""
657451 val safeName = escapeIdentifier(current.streamName)
658− // Fetch up to the in-memory display cap. With a small limit (e.g. 200), a burst of
659− // more than that many logs in one interval would advance lastSeenTimestamp past the
660− // un-fetched rows and drop them permanently. Capping at STREAMING_MAX_LOGS means we
661− // never skip rows we'd actually keep (anything older is evicted by the cap anyway).
662− val sql = "SELECT * FROM \"$safeName\"$whereClause ORDER BY p_timestamp DESC LIMIT $STREAMING_MAX_LOGS"
452+ val sql = "SELECT * FROM \"$safeName\"$whereClause ORDER BY p_timestamp DESC LIMIT 200"
663453
664454 when (val result = repository.queryLogsRaw(sql, startTime, endTime)) {
665455 is ApiResult.Success -> {
666456 val newLogs = result.data
667457 if (newLogs.isNotEmpty()) {
668− // Advance the last-seen boundary. Rows are ordered newest-first, so
669− // normally we jump to the newest. But a full page means the LIMIT may
670− // have capped off matching rows OLDER than the newest in this batch
671− // (possible once filters/search narrow a high-volume stream) — advancing
672− // to the newest would skip them forever. In that case advance only to the
673− // oldest row we did fetch, so the next poll re-queries forward and closes
674− // the gap (re-fetched rows are deduped below).
675− val fullPage = newLogs.size >= STREAMING_MAX_LOGS
676− val boundaryLog = if (fullPage) newLogs.lastOrNull() else newLogs.firstOrNull()
677− val boundaryTimestamp = try {
678− boundaryLog?.get("p_timestamp")?.jsonPrimitive?.content
458+ // Update the last seen timestamp to the most recent log
459+ val newestTimestamp = try {
460+ newLogs.firstOrNull()
461+ ?.get("p_timestamp")?.jsonPrimitive?.content
679462 } catch (_: Exception) {
680463 null
681464 }
682− // Re-canonicalize the server's p_timestamp before reusing it as the next
683− // query's startTime. The raw value can be space-separated or offset-less,
684− // which the query API may reject or misparse — that would stall live-tail
685− // after the first batch. If it can't be parsed, leave lastSeenTimestamp as-is
686− // (the inclusive startTime simply re-fetches the window; rows are deduped).
687− var normalized = boundaryTimestamp?.let { normalizeBoundaryTimestamp(it) }
688− // On a saturated (full) page the boundary is the OLDEST fetched row so the
689− // next poll re-queries forward and closes the LIMIT gap. But if that oldest
690− // row carries the SAME timestamp we're already at — e.g. a burst of more than
691− // STREAMING_MAX_LOGS rows sharing one millisecond, or the parse failing — the
692− // boundary wouldn't move and we'd re-query the identical window forever. Fall
693− // back to the NEWEST row's timestamp to guarantee forward progress; the
694− // skipped backlog would be evicted by the display cap anyway.
695− if (fullPage && (normalized == null || normalized == lastSeenTimestamp)) {
696− val newestTimestamp = try {
697− newLogs.firstOrNull()?.get("p_timestamp")?.jsonPrimitive?.content
698− } catch (_: Exception) {
699− null
700− }
701− val newestNormalized = newestTimestamp?.let { normalizeBoundaryTimestamp(it) }
702− if (newestNormalized != null && newestNormalized != lastSeenTimestamp) {
703− normalized = newestNormalized
704− }
705− }
706− if (normalized != null) {
707− lastSeenTimestamp = normalized
465+ if (newestTimestamp != null) {
466+ lastSeenTimestamp = newestTimestamp
708467 }
709468
710− // The query's startTime is inclusive, so rows sitting on the previous
711− // boundary timestamp get re-fetched. Dedup against everything seen this
712− // session (independent of the display cap) to avoid duplicate rows and an
713− // inflated count. Computed BEFORE the state update — and the seen-set
714− // mutated here, not inside the update lambda, which may re-run.
715− val freshLogs = newLogs.filterNot { logIdentity(it) in seenStreamingKeys }
716− newLogs.forEach { seenStreamingKeys.add(logIdentity(it)) }
717− trimSeenStreamingKeys()
718−
719− if (freshLogs.isEmpty()) {
720− _state.update { it.copy(streaming = it.streaming.copy(streamingError = null)) }
721− } else {
722− _state.update { state ->
723− // Prepend new logs, cap total — avoid full intermediate list allocation
724− val remaining = (STREAMING_MAX_LOGS - freshLogs.size).coerceAtLeast(0)
725− val capped = ArrayList<JsonObject>(freshLogs.size + remaining).apply {
726− addAll(freshLogs)
727− val oldLogs = state.logs
728− addAll(oldLogs.subList(0, remaining.coerceAtMost(oldLogs.size)))
729− }
730− state.copy(
731− logs = capped,
732− logKeys = computeLogKeys(capped),
733− streaming = state.streaming.copy(
734− // Accumulate new rows while the user is scrolled away; reset
735− // to 0 when they're at the top (where prepended rows are seen
736− // live). The previous cap was against total list size, so the
737− // badge saturated at the display cap and never cleared.
738− streamingNewCount = if (viewingTop) {
739− 0
740− } else {
741− state.streaming.streamingNewCount + freshLogs.size
742− },
743− streamingError = null,
744− ),
745− )
469+ _state.update { state ->
470+ // Prepend new logs, cap total — avoid full intermediate list allocation
471+ val remaining = (STREAMING_MAX_LOGS - newLogs.size).coerceAtLeast(0)
472+ val capped = ArrayList<JsonObject>(newLogs.size + remaining).apply {
473+ addAll(newLogs)
474+ val oldLogs = state.logs
475+ addAll(oldLogs.subList(0, remaining.coerceAtMost(oldLogs.size)))
746476 }
477+ state.copy(
478+ logs = capped,
479+ logKeys = computeLogKeys(capped),
480+ streaming = state.streaming.copy(
481+ streamingNewCount = state.streaming.streamingNewCount + newLogs.size,
482+ streamingError = null,
483+ ),
484+ )
747485 }
748486 }
749487 consecutiveStreamingErrors = 0
@@ -770,37 +508,21 @@ class LogViewerViewModel @Inject constructor(
770508
771509 // --- Saved Filters (synced with Parseable server) ---
772510
773− // Serializes loadSavedFilters / saveCurrentFilter / deleteSavedFilter so they never
774− // interleave. Without this, a wholesale-overwrite load completing after a concurrent
775− // save (append) or delete (remove) would silently drop the local add/remove — a
776− // read-modify-write race across coroutines.
777− private val savedFiltersMutex = Mutex()
778−
779511 fun loadSavedFilters() {
780− // Capture the stream this load is for; if the user navigates to a different stream
781− // before it completes, bind the result to the right stream instead of clobbering the
782− // new stream's filter list with another stream's results.
783− val stream = _state.value.streamName
784512 viewModelScope.launch {
785− savedFiltersMutex.withLock {
786− _state.update { it.copy(savedFilters = it.savedFilters.copy(isLoading = true, error = null)) }
787− when (val result = repository.listFilters()) {
788− is ApiResult.Success -> {
789− if (_state.value.streamName != stream) {
790− _state.update { it.copy(savedFilters = it.savedFilters.copy(isLoading = false)) }
791− return@withLock
792− }
793− val streamFilters = result.data
794− .filter { it.streamName == stream }
795− .sortedBy { it.filterName.lowercase() }
796− _state.update {
797− it.copy(savedFilters = it.savedFilters.copy(filters = streamFilters, isLoading = false))
798− }
513+ _state.update { it.copy(savedFilters = it.savedFilters.copy(isLoading = true, error = null)) }
514+ when (val result = repository.listFilters()) {
515+ is ApiResult.Success -> {
516+ val streamFilters = result.data
517+ .filter { it.streamName == _state.value.streamName }
518+ .sortedBy { it.filterName.lowercase() }
519+ _state.update {
520+ it.copy(savedFilters = it.savedFilters.copy(filters = streamFilters, isLoading = false))
799521 }
800− is ApiResult.Error -> {
801− _state.update {
802− it.copy(savedFilters = it.savedFilters.copy(isLoading = false, error = result.userMessage))
803− }
522+ }
523+ is ApiResult.Error -> {
524+ _state.update {
525+ it.copy(savedFilters = it.savedFilters.copy(isLoading = false, error = result.userMessage))
804526 }
805527 }
806528 }
@@ -812,7 +534,6 @@ class LogViewerViewModel @Inject constructor(
812534 if (current.streamName.isEmpty()) return
813535
814536 viewModelScope.launch {
815− savedFiltersMutex.withLock {
816537 _state.update { it.copy(savedFilters = it.savedFilters.copy(isSaving = true, error = null)) }
817538
818539 val query = if (current.filters.customSql.isNotBlank()) {
@@ -821,13 +542,15 @@ class LogViewerViewModel @Inject constructor(
821542 filterQuery = current.filters.customSql,
822543 )
823544 } else {
824− val ruleGroups = current.filters.filterConditions
825− .mapIndexed { index, condition ->
545+ val ruleGroups = current.filters.activeFilters.zip(current.filters.filterClauses)
546+ .mapIndexed { index, (display, _) ->
547+ // Parse display back to field/operator/value
548+ val parts = parseFilterDisplay(display)
826549 FilterRule(
827550 id = "rule_$index",
828− field = condition.column,
829− value = condition.value,
830− operator = condition.operator,
551+ field = parts.first,
552+ value = parts.third,
553+ operator = parts.second,
831554 )
832555 }
833556 val builder = if (ruleGroups.isNotEmpty()) {
@@ -874,7 +597,6 @@ class LogViewerViewModel @Inject constructor(
874597 }
875598 }
876599 }
877− }
878600 }
879601 }
880602
@@ -884,15 +606,9 @@ class LogViewerViewModel @Inject constructor(
884606 when (filter.query.filterType) {
885607 "sql" -> {
886608 val sql = filter.query.filterQuery ?: return
887− // Reset to a clean filter state first, then let executeCustomSql validate
888− // the SQL and own the customSql state. Pre-seeding filters.customSql with
889− // the raw, unvalidated query meant that if executeCustomSql rejected it
890− // (e.g. a legacy non-SELECT saved filter, which returns early without
891− // touching state) we were left wedged in custom-SQL mode with broken SQL
892− // that every later refresh() would keep re-running.
893609 _state.update {
894610 it.copy(
895− filters = FilterState(),
611+ filters = FilterState(customSql = sql),
896612 currentLimit = 500,
897613 )
898614 }
@@ -936,21 +652,32 @@ class LogViewerViewModel @Inject constructor(
936652
937653 fun deleteSavedFilter(filterId: String) {
938654 viewModelScope.launch {
939− savedFiltersMutex.withLock {
940− when (repository.deleteFilter(filterId)) {
941− is ApiResult.Success -> {
942− _state.update {
943− it.copy(
944− savedFilters = it.savedFilters.copy(
945− filters = it.savedFilters.filters.filter { f -> f.filterId != filterId },
946− ),
947− )
948− }
655+ when (repository.deleteFilter(filterId)) {
656+ is ApiResult.Success -> {
657+ _state.update {
658+ it.copy(
659+ savedFilters = it.savedFilters.copy(
660+ filters = it.savedFilters.filters.filter { f -> f.filterId != filterId },
661+ ),
662+ )
949663 }
950− is ApiResult.Error -> { /* Silently ignore — will show on next reload */ }
951664 }
665+ is ApiResult.Error -> { /* Silently ignore — will show on next reload */ }
666+ }
667+ }
668+ }
669+
670+ /** Parse a display string like "column = value" back into (field, operator, value) */
671+ private fun parseFilterDisplay(display: String): Triple<String, String, String> {
672+ for (op in listOf("IS NOT NULL", "IS NULL", "ILIKE", "LIKE", "!=", ">=", "<=", "=", ">", "<")) {
673+ val idx = display.indexOf(" $op")
674+ if (idx >= 0) {
675+ val field = display.substring(0, idx)
676+ val value = display.substring(idx + op.length + 1).trim()
677+ return Triple(field, op, value)
952678 }
953679 }
680+ return Triple(display, "=", "")
954681 }
955682
956683 override fun onCleared() {