cadence/breezewiki
2
4
Fork 4
Code Issues Pull requests 1 Releases Wiki Activity

Solr indexer code cleanup

Browse source
This commit is contained in:
Cadence Ember 2023-12-12 10:35:49 +13:00
parent aea627b27f
commit 27c9680f5b
1 changed files with 200 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

260
archiver/fts.rkt
View file

@ -1,10 +1,13 @@
#lang racket #lang cli
(require racket/function (require (for-syntax racket/base))
(require racket/format
racket/function
racket/future racket/future
racket/match racket/match
racket/path racket/path
racket/promise racket/promise
racket/port racket/port
racket/runtime-path
racket/string racket/string
file/gunzip file/gunzip
db db
@ -16,27 +19,76 @@
"../lib/xexpr-utils.rkt" "../lib/xexpr-utils.rkt"
"../lib/tree-updater.rkt") "../lib/tree-updater.rkt")
(define-syntax (seq stx) (flag (read-from-cache?)
(syntax-case stx () ("-c" "--read-from-cache" "read from last run cache instead of rebuilding documents")
[(_ body ...) (read-from-cache? #t))
#`(for ([op (list (lambda () body) ...)]
[i (in-naturals)]) (define-runtime-path storage-path "../storage/archive")
(define res (op))
(when (>= (response-status-code res) 400) ;; ***************************************************************************************************
(error 'seq "op #~a: status code was ~a: ~v" i (response-status-code res) (response-json res))) ;; Progress bar display
(define taskuid (json-pointer-value "/taskUid" (response-json res))) ;; ***************************************************************************************************
(for/or ([ticks (in-naturals)]
[res2 (in-producer (lambda () (get (format "http://localhost:7700/tasks/~a" taskuid))))]) (struct progress^ (n max title) #:transparent)
(define status (json-pointer-value "/status" (response-json res2)))
(case status (define (make-m-s seconds)
[("enqueued" "processing") (define-values (eta-m eta-s) (quotient/remainder seconds 60))
(sleep 1) (format "~a:~a" eta-m (~a eta-s #:width 2 #:align 'right #:pad-string "0")))
#f]
[("succeeded") (define (make-progress get-p [history-size 20])
(printf "op #~a: ~a (~a ticks)~n" i status ticks) (define update-sleep 1)
#t] (define name-width 30)
[else (define max-width 105)
(error 'seq "op #~a: task status was ~a: ~v" i status res2)])))])) (define history (make-vector history-size 0))
(define history-pointer 0)
(define elapsed 0)
(define (report-progress)
(define p (get-p))
(define history-cycle (vector-ref history history-pointer))
(vector-set! history history-pointer (progress^-n p))
(set! history-pointer (modulo (add1 history-pointer) history-size))
(set! elapsed (add1 elapsed))
(define-values (eta-display diff-per-second)
(cond
[((progress^-n p) . >= . (progress^-max p)) (values (format "~a **" (make-m-s elapsed)) (format "** ~a" (quotient (progress^-max p) (max elapsed 1))))]
[(= history-cycle 0) (values "-:--" "--")]
[else (define diff-per-second (/ (- (progress^-n p) history-cycle) (* history-size update-sleep)))
(define eta-total
(if (diff-per-second . > . 0)
(floor (round (/ (- (progress^-max p) (progress^-n p)) diff-per-second)))
0))
(values (make-m-s eta-total)
(round diff-per-second))]))
(define left (format "~a/~a ~a/s ~a ~a%"
(~a (progress^-n p) #:width (string-length (~a (progress^-max p))) #:align 'right #:pad-string " ")
(progress^-max p)
diff-per-second
eta-display
(floor (* 100 (/ (progress^-n p) (progress^-max p))))))
(define name-display (~a (progress^-title p) #:max-width name-width #:limit-marker "..."))
(define remaining-space (- max-width name-width (string-length left) 2))
(define bar-width
(floor (* (sub1 remaining-space)
(/ (progress^-n p) (progress^-max p)))))
(define bar (string-append (make-string bar-width #\=)
">"
(make-string (- remaining-space bar-width) #\ )))
(printf "\e[2K\r~a~a~a" left bar name-display)
(flush-output))
(define (report-progress-loop)
(sleep update-sleep)
(report-progress)
(report-progress-loop))
(define t (thread report-progress-loop))
(define (quit)
(kill-thread t)
(report-progress)
(displayln ""))
quit)
;; ***************************************************************************************************
;; Page text extractor
;; ***************************************************************************************************
(define (class-has? attributes substrs) (define (class-has? attributes substrs)
(define cl (or (get-attribute 'class attributes) "")) (define cl (or (get-attribute 'class attributes) ""))
@ -49,9 +101,6 @@
[#t [#t
(list element-type attributes children)])) (list element-type attributes children)]))
(define slc (sqlite3-connect #:database "../storage/fts-separate.db"))
(sqlite3-load-extension slc "fts5")
(define (writer tables-mode? page) (define (writer tables-mode? page)
(define (writer-inner page) (define (writer-inner page)
(for ([bit page]) (for ([bit page])
@ -72,12 +121,9 @@
(define shrink-text (regexp-replace* #px"([ \t]*\r?\n+)+" text "\n")) (define shrink-text (regexp-replace* #px"([ \t]*\r?\n+)+" text "\n"))
shrink-text) shrink-text)
(define wikiname "bloons")
(define tablename (format "page_~a" wikiname))
(define ((extract f)) ; f - filename (define ((extract f)) ; f - filename
(with-handlers (with-handlers
([exn:fail? (λ (err) (println f) (raise err))]) ([exn:fail? (λ (err) (printf "extract: ~a: ~v~n" f err))])
(define j (define j
(case (path-get-extension f) (case (path-get-extension f)
[(#".json") [(#".json")
@ -93,110 +139,62 @@
(define page (update-tree updater (html->xexp page-html))) (define page (update-tree updater (html->xexp page-html)))
(define body (write-and-post-process #f page)) (define body (write-and-post-process #f page))
(define table (write-and-post-process #t page)) (define table (write-and-post-process #t page))
(values title body table pageid))) (list title body table pageid)))
(define results ;; ***************************************************************************************************
(for/list ([f (directory-list (format "../storage/archive/~a" wikiname) #:build? #t)] ;; Program, loop, Solr APIs
#:when (member (path-get-extension f) '(#".json" #".gz"))) ;; ***************************************************************************************************
(program
(start [wikiname "wikiname to download"])
(define results
(for/list ([f (directory-list (build-path storage-path wikiname) #:build? #t)]
#:when (member (path-get-extension f) '(#".gz")))
(extract f))) (extract f)))
;; *************************************************************************************************** (define data
;; TESTING WRITER (cond
;; *************************************************************************************************** [(and (read-from-cache?) (file-exists? "cache.rkt"))
#;(for/first ([fut results] (displayln "Reading in...")
[i (in-naturals 1)] (with-input-from-file "cache.rkt" (λ () (read)))]
#:when (i . >= . 4859)) [else
(define-values (title body table pageid) (fut)) (define x (box (progress^ 0 1 "...")))
(println title) (define quit (make-progress (λ () (unbox x))))
(println body) (define data
(println table)) (for/list ([fut results]
[i (in-naturals 1)]
#:do [(define page (fut))]
#:when (not (void? page)))
(match-define (list title body table pageid) page)
(define len (string-length body))
(set-box! x (progress^ i (length results) title))
`#hasheq((id . ,(number->string pageid))
(title . ,title)
(body . ,body)
(table . ,table)
(len . ,len))))
(quit)
(println "inserting...") (display "Writing out... ")
(flush-output)
(with-output-to-file "cache.rkt" (λ () (write data)) #:exists 'truncate/replace)
data]))
;; *************************************************************************************************** (display "Converting... ")
;; SQLite FTS5 (flush-output)
;; *************************************************************************************************** (define ser (jsexpr->bytes data))
#;(begin (define ser-port (open-input-bytes ser))
(query-exec slc "begin transaction") (define quit (make-progress (λ () (progress^ (ceiling (/ (file-position ser-port) 64 1024))
#;(query-exec slc (format "create virtual table \"~a\" using fts5 (title, body, tokenize='porter unicode61')" wikiname)) (ceiling (/ (bytes-length ser) 64 1024))
(time "Posting..."))
(for ([fut results] 2))
[i (in-naturals 1)]) (define res
(display "-") (post (format "http://localhost:8983/solr/~a/update?commit=true" wikiname)
(when (and (> i 0) (= (modulo i 100) 0)) #:data ser-port
(println i)) #:headers '#hasheq((Content-Type . "application/json"))
(define-values (title shrink-text) (fut)) #:timeouts (make-timeout-config #:lease 5 #:connect 5 #:request 300)))
(query-exec slc (format "insert into \"~a\" (title, body) values (?, ?)" tablename) title shrink-text))) (quit)
(displayln (response-status-line res)))
(println "running optimize...") (run start)
(query-exec slc (format "insert into \"~a\" (\"~a\") values ('optimize')" tablename tablename))
(println "committing...")
(query-exec slc "commit"))
;; ***************************************************************************************************
;; Solr
;; ***************************************************************************************************
(begin
(define data
(cond
#;[(file-exists? "cache.rkt")
(println "reading in...")
(with-input-from-file "cache.rkt" (λ () (read)))]
[else
(define data
(for/list ([fut results]
[i (in-naturals 1)])
(display "-")
(when (and (> i 0) (= (modulo i 100) 0))
(println i))
(define-values (title body table pageid) (fut))
(define len (string-length body))
`#hasheq((id . ,(number->string pageid))
(title . ,title)
(body . ,body)
(table . ,table)
(len . ,len))))
(println "writing out...")
(with-output-to-file "cache.rkt" (λ () (write data)) #:exists 'truncate/replace)
data]))
(println "posting...")
(define res
(post (format "http://localhost:8983/solr/~a/update?commit=true" wikiname)
#:json data)))
;; ***************************************************************************************************
;; Meilisearch
;; ***************************************************************************************************
#;(begin
(seq
(put (format "http://localhost:7700/indexes/~a/settings/searchable-attributes" wikiname)
#:json '("title" "body"))
(put (format "http://localhost:7700/indexes/~a/settings/ranking-rules" wikiname)
#:json '("words" "typo" #;"proximity" "attribute" "sort" "exactness" #;"len:desc"))
(call-with-input-file "stop-words.json"
(λ (in)
(put (format "http://localhost:7700/indexes/~a/settings/stop-words" wikiname)
#:headers '#hasheq((Content-Type . "application/json"))
#:data in))))
(define data
(for/list ([fut results]
[i (in-naturals 1)])
(display "-")
(when (and (> i 0) (= (modulo i 100) 0))
(println i))
(define-values (title body pageid) (fut))
(define len (string-length body))
`#hasheq((id . ,pageid)
(title . ,title)
(body . ,body)
(len . ,len))))
(define res
(post (format "http://localhost:7700/indexes/~a/documents" wikiname)
#:json data))
(seq res)
(println (response-json res)))
(disconnect slc)