Brad Arant
b0cadc3f08
JetCore engine (Tag.cpp/.h, Global.cpp/.h, __*.cpp tag classes): - Numerous __mysql.cpp connection-pooling correctness fixes (stale result sets, double-indirection sessionid bugs, field caching, pool keying) and a session-registration-before-connection-confirmed ordering fix (dangling pointer on a failed connect) - Tag.cpp: large body of fixes to the tag-dispatch/container-scanning logic (bare-name fallback, database aliasing, single-quote handling, @-prefix session variable resolution, TAGDEF caching, nested split-tag scanning for if/while/until/ifrow so an inner one doesn't corrupt an outer one's own boundary scan) plus the process-first rendering order fix (a <process> now runs before <checksession>/page resolution, fixing a real "blank page after successful login" bug) - Global.h/.cpp: added imapSessions (parallel to the existing __mysql* session map) for the new <imap> tag family - __whiledir.cpp/__include.cpp: caching and directory-name-aliasing fixes - __call.cpp/.h: fixed a dangling-pointer bug - __write.cpp: fixed an O_WRONLY-only open that couldn't create a new file - __ifrow.cpp/__sql.cpp: fixed the same sessionid double-indirection bug __mysql.cpp had (resolveKeyword's result was being used as a map key lookup instead of the resolved value itself) jetc compiler (jetc/JetParser.cpp/.h, JetCodegen.cpp/.h, JetAST.h, jetc.cpp, build-shared.sh, build-compiled.sh): - Parser fixes: inline <include>, nested-quote handling, void-tag recognition - Codegen fixes and expanded AST support - build-shared.sh: atomic rename into place for a freshly-built .jtc (a live server dlopen()ing the same path mid-rebuild was corrupting its own already-mapped view of the old file) and a staleness check so a cached JetCore .o doesn't silently keep serving yesterday's fixes forever - Added -lssl to both build scripts' link lines (needed once the new <imap> tag's client-side TLS code existed - previously nothing in this codebase used OpenSSL's SSL/TLS client API, only libcrypto) Site content (jetc/barant-site/): SPA (fetch-and-swap navigation) rollout across essentially every .page/.jet/.section/.tag/.proc/.method file - dynamic-content fixes, fragment-mode stripping, native $[@name] session variables replacing older mechanisms, and this session's own checkout.page redesign, login start-param redirect fix, and per-page side-menu (menu.bar/$[PAGE].menu) refresh support. Completed the earlier main.css/control.css move from assets/ to assets/images/ (git still showed the old paths as tracked-but-deleted until now). Deliberately left out of this commit: dozens of .pre-<description>- <date> manual backup files (this session's and earlier ones' own before/after snapshots, not meant for permanent history), compiled .jtc build outputs, ad hoc test binaries and scripts under jetc/ (login_asan, wcwc_test, optest2_bin, etc.), and jetc/__pycache__/ - none of these are meant to be tracked; a .gitignore covering them would be worth adding separately.
57 lines
1.8 KiB
C++
57 lines
1.8 KiB
C++
#ifndef ____mysql_h__
|
|
#define ____mysql_h__
|
|
|
|
#include "Tag.h"
|
|
#include "ZString.h"
|
|
#include "MString.h"
|
|
#include <sstream>
|
|
#include <string>
|
|
#include <unordered_map>
|
|
#include <mysql/mysql.h>
|
|
|
|
namespace jet {
|
|
|
|
class __mysql : public Tag {
|
|
|
|
public:
|
|
__mysql(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent, Tag *local);
|
|
~__mysql();
|
|
|
|
void query(coreutils::MString query);
|
|
void nextRow();
|
|
bool hasRow();
|
|
coreutils::ZString getColumnValue(coreutils::ZString column);
|
|
|
|
private:
|
|
// Explicitly initialized - result/row/fieldLength were otherwise
|
|
// left as garbage stack values until query() first ran. A
|
|
// <mysql>...</mysql> block that connects successfully but never
|
|
// runs a <sql> query inside it (e.g. just a connectivity check)
|
|
// would previously reach ~__mysql()'s mysql_free_result(result)
|
|
// with an uninitialized pointer - real undefined behavior, found
|
|
// while root-causing a live crash in a related part of this same
|
|
// class's constructor.
|
|
MYSQL *mysql = NULL;
|
|
MYSQL_RES *result = NULL;
|
|
MYSQL_ROW row = NULL;
|
|
unsigned long *fieldLength = NULL;
|
|
unsigned int qFields = 0;
|
|
coreutils::MString sessionId;
|
|
|
|
// Column-name -> row[] index, built once per query() call (see its
|
|
// own comment) instead of getColumnValue() re-deriving it via a
|
|
// fresh mysql_fetch_field_direct() linear scan on every single
|
|
// named lookup - a template reading N columns off one row used to
|
|
// pay that scan N times over, even though the schema is fixed for
|
|
// the lifetime of one result set.
|
|
std::unordered_map<std::string, int> fieldIndex;
|
|
|
|
coreutils::MString nbrOfRows = "0";
|
|
coreutils::MString nbrOfColumns = "0";
|
|
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|