diff --git a/.devcontainer/requirements.txt b/.devcontainer/requirements.txt index 2b63abacfea..5be8b3c0127 100644 --- a/.devcontainer/requirements.txt +++ b/.devcontainer/requirements.txt @@ -1,9 +1,10 @@ -black==26.3.1 +black==26.10.1 click==8.1.7 isort==5.12.0 mypy-extensions==1.0.0 packaging==23.2 pathspec==1.0.0 platformdirs==4.0.0 +pytokens==0.4.1 tomli==2.0.1 typing_extensions==4.8.0 diff --git a/.devcontainer/src/test/regress/Pipfile b/.devcontainer/src/test/regress/Pipfile index 58f4950f076..f7ce1fe22dd 100644 --- a/.devcontainer/src/test/regress/Pipfile +++ b/.devcontainer/src/test/regress/Pipfile @@ -4,35 +4,37 @@ url = "https://pypi.python.org/simple" verify_ssl = true [packages] -pyasn1 = ">=0.6.4" -mitmproxy = {git = "https://github.com/citusdata/mitmproxy.git", ref = "a16444362cc0393ccf7329f50fc909b711729de7"} +pyasn1 = ">=0.6.5" +mitmproxy = {git = "https://github.com/citusdata/mitmproxy.git", ref = "5cd63296e7dab274e275553df76e9699ea220032"} "aioquic" = ">=1.2.0,<1.3.0" "mitmproxy-rs" = ">=0.12.6,<0.13.0" argon2-cffi = ">=23.1.0" bcrypt = ">=4.1.2" -brotli = "<=1.2.0" +brotli = "==1.2.1" h11 = "==0.16.0" h2 = "==4.4.1" -tornado = ">=6.5.8,<6.6.0" -msgpack = ">=1.2.1" +tornado = "==6.6.1" +msgpack = "==1.2.3" +urwid = "==4.0.7" zstandard = ">=0.25.0" construct = "*" docopt = "==0.6.2" cryptography = "==50.0.0" pytest = "==9.0.3" psycopg = "*" -filelock = "*" +filelock = "==4.2.1" +certifi = "==2026.10.19" pytest-asyncio = "*" pytest-timeout = "*" pytest-xdist = "*" pytest-repeat = "*" pyyaml = "*" -werkzeug = "==3.1.6" +werkzeug = "==3.1.9" "typing-extensions" = ">=4.13.2,<5" pyperclip = "==1.9.0" [dev-packages] -black = "==26.3.1" +black = "==26.10.1" isort = "*" flake8 = "*" flake8-bugbear = "*" diff --git a/.devcontainer/src/test/regress/Pipfile.lock b/.devcontainer/src/test/regress/Pipfile.lock index 47c332fc96d..21c3e663581 100644 --- a/.devcontainer/src/test/regress/Pipfile.lock +++ b/.devcontainer/src/test/regress/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "2ba804b49514faf026f3ebdb7ac55402c538f9808a86af4e2945f557e951c09d" + "sha256": "d8533030a737a9566052eddc84718b1a04438e4171e49c68d29b2f02013f22d0" }, "pipfile-spec": 6, "requires": { @@ -201,117 +201,161 @@ }, "brotli": { "hashes": [ - "sha256:022426c9e99fd65d9475dce5c195526f04bb8be8907607e27e747893f6ee3e24", - "sha256:072e7624b1fc4d601036ab3f4f27942ef772887e876beff0301d261210bca97f", - "sha256:09ac247501d1909e9ee47d309be760c89c990defbb2e0240845c892ea5ff0de4", - "sha256:0bbd5b5ccd157ae7913750476d48099aaf507a79841c0d04a9db4415b14842de", - "sha256:0cf8c3b8ba93d496b2fae778039e2f5ecc7cff99df84df337ca31d8f2252896c", - "sha256:14ef29fc5f310d34fc7696426071067462c9292ed98b5ff5a27ac70a200e5470", - "sha256:15b33fe93cedc4caaff8a0bd1eb7e3dab1c61bb22a0bf5bdfdfd97cd7da79744", - "sha256:1b1d6a4efedd53671c793be6dd760fcf2107da3a52331ad9ea429edf0902f27a", - "sha256:1b557b29782a643420e08d75aea889462a4a8796e9a6cf5621ab05a3f7da8ef2", - "sha256:1b71754d5b6eda54d16fbbed7fce2d8bc6c052a1b91a35c320247946ee103502", - "sha256:1ce223652fd4ed3eb2b7f78fbea31c52314baecfac68db44037bb4167062a937", - "sha256:1e68cdf321ad05797ee41d1d09169e09d40fdf51a725bb148bff892ce04583d7", - "sha256:260d3692396e1895c5034f204f0db022c056f9e2ac841593a4cf9426e2a3faca", - "sha256:26e8d3ecb0ee458a9804f47f21b74845cc823fd1bb19f02272be70774f56e2a6", - "sha256:2881416badd2a88a7a14d981c103a52a23a276a553a8aacc1346c2ff47c8dc17", - "sha256:29b7e6716ee4ea0c59e3b241f682204105f7da084d6254ec61886508efeb43bc", - "sha256:2a7f1d03727130fc875448b65b127a9ec5d06d19d0148e7554384229706f9d1b", - "sha256:2d39b54b968f4b49b5e845758e202b1035f948b0561ff5e6385e855c96625971", - "sha256:2e1ad3fda65ae0d93fec742a128d72e145c9c7a99ee2fcd667785d99eb25a7fe", - "sha256:3173e1e57cebb6d1de186e46b5680afbd82fd4301d7b2465beebe83ed317066d", - "sha256:3219bd9e69868e57183316ee19c84e03e8f8b5a1d1f2667e1aa8c2f91cb061ac", - "sha256:350c8348f0e76fff0a0fd6c26755d2653863279d086d3aa2c290a6a7251135dd", - "sha256:35d382625778834a7f3061b15423919aa03e4f5da34ac8e02c074e4b75ab4f84", - "sha256:3b90b767916ac44e93a8e28ce6adf8d551e43affb512f2377c732d486ac6514e", - "sha256:3e1b35d56856f3ed326b140d3c6d9db91740f22e14b06e840fe4bb1923439a18", - "sha256:3ebe801e0f4e56d17cd386ca6600573e3706ce1845376307f5d2cbd32149b69a", - "sha256:3f3c908bcc404c90c77d5a073e55271a0a498f4e0756e48127c35d91cf155947", - "sha256:40d918bce2b427a0c4ba189df7a006ac0c7277c180aee4617d99e9ccaaf59e6a", - "sha256:465a0d012b3d3e4f1d6146ea019b5c11e3e87f03d1676da1cc3833462e672fb0", - "sha256:4735a10f738cb5516905a121f32b24ce196ab82cfc1e4ba2e3ad1b371085fd46", - "sha256:4ecdb3b6dc36e6d6e14d3a1bdc6c1057c8cbf80db04031d566eb6080ce283a48", - "sha256:50b1b799f45da91292ffaa21a473ab3a3054fa78560e8ff67082a185274431c8", - "sha256:54a50a9dad16b32136b2241ddea9e4df159b41247b2ce6aac0b3276a66a8f1e5", - "sha256:5732eff8973dd995549a18ecbd8acd692ac611c5c0bb3f59fa3541ae27b33be3", - "sha256:598e88c736f63a0efec8363f9eb34e5b5536b7b6b1821e401afcb501d881f59a", - "sha256:640fe199048f24c474ec6f3eae67c48d286de12911110437a36a87d7c89573a6", - "sha256:66c02c187ad250513c2f4fce973ef402d22f80e0adce734ee4e4efd657b6cb64", - "sha256:67a91c5187e1eec76a61625c77a6c8c785650f5b576ca732bd33ef58b0dff49c", - "sha256:6be67c19e0b0c56365c6a76e393b932fb0e78b3b56b711d180dd7013cb1fd984", - "sha256:6c12dad5cd04530323e723787ff762bac749a7b256a5bece32b2243dd5c27b21", - "sha256:71a66c1c9be66595d628467401d5976158c97888c2c9379c034e1e2312c5b4f5", - "sha256:7274942e69b17f9cef76691bcf38f2b2d4c8a5f5dba6ec10958363dcb3308a0a", - "sha256:7547369c4392b47d30a3467fe8c3330b4f2e0f7730e45e3103d7d636678a808b", - "sha256:7a47ce5c2288702e09dc22a44d0ee6152f2c7eda97b3c8482d826a1f3cfc7da7", - "sha256:7a61c06b334bd99bc5ae84f1eeb36bfe01400264b3c352f968c6e30a10f9d08b", - "sha256:7ad8cec81f34edf44a1c6a7edf28e7b7806dfb8886e371d95dcf789ccd4e4982", - "sha256:7e9053f5fb4e0dfab89243079b3e217f2aea4085e4d58c5c06115fc34823707f", - "sha256:7fa18d65a213abcfbb2f6cafbb4c58863a8bd6f2103d65203c520ac117d1944b", - "sha256:81da1b229b1889f25adadc929aeb9dbc4e922bd18561b65b08dd9343cfccca84", - "sha256:82676c2781ecf0ab23833796062786db04648b7aae8be139f6b8065e5e7b1518", - "sha256:832c115a020e463c2f67664560449a7bea26b0c1fdd690352addad6d0a08714d", - "sha256:844a8ceb8483fefafc412f85c14f2aae2fb69567bf2a0de53cdb88b73e7c43ae", - "sha256:865cedc7c7c303df5fad14a57bc5db1d4f4f9b2b4d0a7523ddd206f00c121a16", - "sha256:88ef7d55b7bcf3331572634c3fd0ed327d237ceb9be6066810d39020a3ebac7a", - "sha256:898be2be399c221d2671d29eed26b6b2713a02c2119168ed914e7d00ceadb56f", - "sha256:8d4f47f284bdd28629481c97b5f29ad67544fa258d9091a6ed1fda47c7347cd1", - "sha256:92edab1e2fd6cd5ca605f57d4545b6599ced5dea0fd90b2bcdf8b247a12bd190", - "sha256:9322b9f8656782414b37e6af884146869d46ab85158201d82bab9abbcb971dc7", - "sha256:95db242754c21a88a79e01504912e537808504465974ebb92931cfca2510469e", - "sha256:963a08f3bebd8b75ac57661045402da15991468a621f014be54e50f53a58d19e", - "sha256:96fbe82a58cdb2f872fa5d87dedc8477a12993626c446de794ea025bbda625ea", - "sha256:99cfa69813d79492f0e5d52a20fd18395bc82e671d5d40bd5a91d13e75e468e8", - "sha256:9c79f57faa25d97900bfb119480806d783fba83cd09ee0b33c17623935b05fa3", - "sha256:9e5825ba2c9998375530504578fd4d5d1059d09621a02065d1b6bfc41a8e05ab", - "sha256:9fe11467c42c133f38d42289d0861b6b4f9da31e8087ca2c0d7ebb4543625526", - "sha256:a1778532b978d2536e79c05dac2d8cd857f6c55cd0c95ace5b03740824e0e2f1", - "sha256:a387225a67f619bf16bd504c37655930f910eb03675730fc2ad69d3d8b5e7e92", - "sha256:a56ef534b66a749759ebd091c19c03ef81eb8cd96f0d1d16b59127eaf1b97a12", - "sha256:aa47441fa3026543513139cb8926a92a8e305ee9c71a6209ef7a97d91640ea03", - "sha256:ac27a70bda257ae3f380ec8310b0a06680236bea547756c277b5dfe55a2452a8", - "sha256:acec55bb7c90f1dfc476126f9711a8e81c9af7fb617409a9ee2953115343f08d", - "sha256:adedc4a67e15327dfdd04884873c6d5a01d3e3b6f61406f99b1ed4865a2f6d28", - "sha256:af43b8711a8264bb4e7d6d9a6d004c3a2019c04c01127a868709ec29962b6036", - "sha256:b232029d100d393ae3c603c8ffd7e3fe6f798c5e28ddca5feabb8e8fdb732997", - "sha256:b35c13ce241abdd44cb8ca70683f20c0c079728a36a996297adb5334adfc1c44", - "sha256:b63daa43d82f0cdabf98dee215b375b4058cce72871fd07934f179885aad16e8", - "sha256:b908d1a7b28bc72dfb743be0d4d3f8931f8309f810af66c906ae6cd4127c93cb", - "sha256:ba76177fd318ab7b3b9bf6522be5e84c2ae798754b6cc028665490f6e66b5533", - "sha256:bba6e7e6cfe1e6cb6eb0b7c2736a6059461de1fa2c0ad26cf845de6c078d16c8", - "sha256:c0d6770111d1879881432f81c369de5cde6e9467be7c682a983747ec800544e2", - "sha256:c16ab1ef7bb55651f5836e8e62db1f711d55b82ea08c3b8083ff037157171a69", - "sha256:c1702888c9f3383cc2f09eb3e88b8babf5965a54afb79649458ec7c3c7a63e96", - "sha256:c25332657dee6052ca470626f18349fc1fe8855a56218e19bd7a8c6ad4952c49", - "sha256:c8565e3cdc1808b1a34714b553b262c5de5fbda202285782173ec137fd13709f", - "sha256:cf9cba6f5b78a2071ec6fb1e7bd39acf35071d90a81231d67e92d637776a6a63", - "sha256:d206a36b4140fbb5373bf1eb73fb9de589bb06afd0d22376de23c5e91d0ab35f", - "sha256:d2d085ded05278d1c7f65560aae97b3160aeb2ea2c0b3e26204856beccb60888", - "sha256:d8c05b1dfb61af28ef37624385b0029df902ca896a639881f594060b30ffc9a7", - "sha256:e310f77e41941c13340a95976fe66a8a95b01e783d430eeaf7a2f87e0a57dd0a", - "sha256:e7c0af964e0b4e3412a0ebf341ea26ec767fa0b4cf81abb5e897c9338b5ad6a3", - "sha256:e80a28f2b150774844c8b454dd288be90d76ba6109670fe33d7ff54d96eb5cb8", - "sha256:e813da3d2d865e9793ef681d3a6b66fa4b7c19244a45b817d0cceda67e615990", - "sha256:e85190da223337a6b7431d92c799fca3e2982abd44e7b8dec69938dcc81c8e9e", - "sha256:e99befa0b48f3cd293dafeacdd0d191804d105d279e0b387a32054c1180f3161", - "sha256:eda5a6d042c698e28bda2507a89b16555b9aa954ef1d750e1c20473481aff675", - "sha256:ef87b8ab2704da227e83a246356a2b179ef826f550f794b2c52cddb4efbd0196", - "sha256:f16dace5e4d3596eaeb8af334b4d2c820d34b8278da633ce4a00020b2eac981c", - "sha256:f8d635cafbbb0c61327f942df2e3f474dde1cff16c3cd0580564774eaba1ee13", - "sha256:fc1530af5c3c275b8524f2e24841cbe2599d74462455e9bae5109e9ff42e9361", - "sha256:ff09cd8c5eec3b9d02d2408db41be150d8891c5566addce57513bf546e3d6c6d" + "sha256:0023348c448140a6ea71615eba331835c971d38ae8acf8a89b4e963b1f38f131", + "sha256:00a50d063aae2e69c2eb28818ccf6dc3e51f2ea5b74e3c2082a47943ee23f399", + "sha256:00c9a4262dd81cdc32968f8bc2482c735ad238010d95b49698f1b788c359c7a4", + "sha256:02b2f7b5a83485efe448a44ddf7983def05c3bb1dcf917d4f7154070260e13de", + "sha256:035f3bf861328d8b7fcb61f4a976f9913027158e5666116733d59ffc65f2745e", + "sha256:06a22fcbcae059c0679098232779095fc50a735a3fea02db5c79cab10b84d877", + "sha256:09a2f112a638aca15a88f298571788795fc45d62f2bca7f3870c1152153ef399", + "sha256:09b560859a04d112d206639c7e444161ee2f413098aa6de11d43daf3ce883d24", + "sha256:0a30e5df5ba985b67f85e13dfd7e5a68e186d8d9b5cff7d9a8904832bb413e81", + "sha256:0c5c6144aa4b4585e4e0b3595f9fb2743a2e32650bce4b2669a0e809b3e7bbbd", + "sha256:103b4762941760ae245d8d0d50e3ee4a7e034fcd786f122d177f76d6afc90c63", + "sha256:104d3504678db9172de523bdd8e6ab8d3643067fbde18e5b89476f405b64cf25", + "sha256:11aec6ea5c20cad61a33302e06baa48b0243bfa4d173bc2985dabd047e367d08", + "sha256:1329c80daa60752f1d94f507479504921e358e71746c5fce9b55b3d51ac038bc", + "sha256:1624ca7006d2776cc8f0313e62d63aef9d3720b66f0d24e4439f5d754488e001", + "sha256:1880db6241276e191d3e34a6e4eea708c6629103c396f0ea21e75b0ce63a9a2c", + "sha256:1f5d8c6e68555b82692f8180ee646cd1752aa9ab98daf68769a7c56a6e8d7af7", + "sha256:1f65a91f3576949793b8720b12a47e7ea06debc970a2da6d54ff8458053e2109", + "sha256:228abf241b39925450ea5046cbd8bc88ae1b91cd229037b0e194409df4ef2f4a", + "sha256:23f0d23995100458d17f3bf5ce1e959fe46df894b472063a74266f7adeb2e72e", + "sha256:24a3f765167e6ecac3d85a9fe3da857a068097cf44abc08bd67c5681d8251bca", + "sha256:25d7c19ea92df4be1358126b6712209ac58229d17af915397d1510f9efe0411d", + "sha256:264fd5b200f6f6170cb551a4b9fcaabf8aa846ddaefe72db4d5f49f9d3743df9", + "sha256:2df1678c2c25db2f669c613fe8b4e587d0dd24c6acf7746bad13d6e87e4b051d", + "sha256:304ee5bf4f85b719f6a274fa0b50d86b39b5dd1219f4cc61410d4eae315757a9", + "sha256:32567555e2e0040c596beb7f5f2ef69da6bf224aee4617c2a52099248dd3e243", + "sha256:338856ae9ff63af4fc3dbbd6184a7276a6ae83df2243562e86e5ee5cf980cce7", + "sha256:37de1818ce469b3c37324c89d4d4dbb5e64461d9dc01c16f8abb2a17c465b132", + "sha256:390f5e174ac2296dafd047d0785591e61194ff3df11ad43abd2fddb0e750eff5", + "sha256:3975fb11f63e212b87a087e4a910187b522c6969a4989ca362d6f85f9dc36acd", + "sha256:3b7df499157279a4d5d83ab86bd328c58c9ccfc48f5de45d4e791d3234a54dff", + "sha256:4092027deb7313156d2b601fb0e3637cbdf9d598f5bd57dc57348432967ecd31", + "sha256:457f011c135263900805b4bf0dd290724d277785656c32e4f5fefe4a1feede1e", + "sha256:4583e4d11d40fa4a05b7d81cd822008d65bce755dd78c49945b5a98272953759", + "sha256:461daaef60db39e407a6a6954a2b4804170db56c6212c009a6cdadbdd12d7a9b", + "sha256:4839f1a1ec3a95671238b2a165eba7a0a823090913ab4fc48aa03dc6f666dd02", + "sha256:49de36a626557629db1f9b1eb57e7d88f3815a42373ff7f9d8b87c1da120687e", + "sha256:4acd709bfe362c2ed80da311d195654467110bc747de1484c731304810fd20e5", + "sha256:4b9dd0173ca5e01d1eb307d3c184fe8c09bdc168ede560889b1018d216d38c61", + "sha256:4d47a9f0ba5ee608f3f3a9c942dcd244443068ae5b0d90183dd396dea02236e4", + "sha256:4e89a05511f8538911d98566f6ddd0883f28a5ab35fefbd70c036ab630feae1b", + "sha256:4f94a73b5f30b8bb36ac684f2b6a6e9bdc58a9b4bfe1658592727369443bce93", + "sha256:50248e2f05c8335089b9c2a80ebb4a8b5833a3581a433438b523e2341f45e681", + "sha256:509ee1058937d80d88b33aa893ca46e1925779d928181916bd60bda3a8738687", + "sha256:59ca34c7a83d7a3b842247183c426f891a95a8f57db41b7aac92195c51e8a83a", + "sha256:59ec359a56f44277ad424fb4b7cf1a0ae2fd855b35ba8f15dcfbcabb3fb51aeb", + "sha256:5c77d41984e388c9f393da124394af941ef757fb33bb6f1eb72e8167fc557489", + "sha256:5da5cb778a7fc889f72bd2238ddf39b9f7e8b0979ccefd760380f1c24bd9f33b", + "sha256:5f3da70516b1bd1b2aa183ec4ab5c02dfc6ad5c1184d47bb65ade25e710439b6", + "sha256:624240d21823e1805425c155fe8b35b4124e0a837eb8ea271bd0a54caeac4ef6", + "sha256:6532d2c58018121a9eb5882656cf862cdbbd853600cb5fbccac59bcff14f66b0", + "sha256:66f171af80744c06f6b4e5b01fe6e40c70cc4e17570888746a281422fed83fc0", + "sha256:67f4dceb22ce3a742751cee849644449b169684699aa548e77d771de304e963c", + "sha256:6b3c3d5794212a54434b4856f808f7bdf7ad48eacadaadb5b2346fc9a639365a", + "sha256:6b885b6b1a3b01c5980dddeb2d9dccbc5a5dc0f255ea15904bf585b73ef375a1", + "sha256:6bd29ab84bb8972370cacd310e8a91651f54476d01de1cd1a4cf0bece5eb25e1", + "sha256:6beca755e6b691096a398df587f544c3f8ff6e9e3a8119d90eae37872a829382", + "sha256:6f83664d0e48fd22114dd5ca2cd5202743a7b75b5e6e3fbc6ed61489cee749c8", + "sha256:7248c282d7d6aef4ae89363da5fc3df7b9250eb04b252622955296eb5d0ea82f", + "sha256:727c922e0e8511e22a7f3c81fbcce0aeebc8c7cdb7bd8f13f505394ea9865dcf", + "sha256:761db18dc32b24d00fbedca1013089eb3470053cefa8492bd9c07b11102d72bf", + "sha256:76b11b4af067c2b55ffde313ae978d8ab51cfa65046bb70de23448c9dc4e18c4", + "sha256:77ef5882c5318ffc3dd94c6abc6a8f1ec2af75d66522319f1a250a07d53d0546", + "sha256:77fe6845833339ff6c54be391b56dc5fcff9e7a9acdf7df54647d27e5d3afdd2", + "sha256:78c9b5c2cceaeb158d56d03ba9336b3d310c64da6d304296ba39b6c00b8840c1", + "sha256:7a553fffd70a518916ce5b595b3067a55c0357732b4f0a96db2dce70a4db717b", + "sha256:7aa24d49840c016a8256adb1f104f4e064ed9fa7d97523675dd50e08c05b143d", + "sha256:7c0f9fcfa54570222eb4cbece2fc44b71de3710e0ea6e075bc0ffdc8965ca1ac", + "sha256:7ec678c52c3ef5e37482a094d109c04cf9e4a0e2923dd1e0fbddb4bf133a976e", + "sha256:7f38649a7711c301ee231e296e0c8f14376a9d4f9ea7369ecc3cb22187813d9e", + "sha256:810aea5958d6a2d92593fd27218df528644aeb72cc7f6d401e650752d6c98949", + "sha256:81f289389af277345b85aea4b36f4ed2bbdf7504d4466cbec7d28702c4926b01", + "sha256:87492842770cd772fce25e9cd279913eaea6c55a91a960b6302aedfa2ec7b152", + "sha256:875975f91870682cca4371260522ad3f22d636e845b5c5355c52bc045c0f75c8", + "sha256:90bd49511341dd7c40bb3acaa97cd8b9e5df4821a5714b842117e7069c7cc03e", + "sha256:91097d66ebb8ca8d23372081a33405a44e2239445614888e38929bd7f5879dae", + "sha256:9307679936e86d7773eadfa444a4a4ee80f6f45230e93379875f4a6897a09a2b", + "sha256:93269f11303fc9a3e3990b57e0533f41949546156d9f0e535571f313032563cc", + "sha256:96e6966edcfae74ffac2522d2dd1a304450d18807a9791f5ed0a3232192c9437", + "sha256:970a3dbce807a3f5c2b8232036052bade01e4bc92ade37d73ea3750418307fa1", + "sha256:972a2e19dbaab47d0aa77c1d07f71c930bdc53538f2b33decc905e92a4be5cbd", + "sha256:972e34c5cbbfe6c90358bfae38edae1a29d3456e920da5a4664c98f221ee4df8", + "sha256:9acd83184eed969a08c1afa404a202a3f4287e3580781f2a36e927d4f25363fd", + "sha256:9f9aba3f8d2e3c22cf233d9bf2c2cfc050989d9da627802845df317d7ab33e84", + "sha256:a151eca7da2b04b6bed1f70138b50f5634704b98ee3ee63046316d7661f21b75", + "sha256:a26384540c88b7c157899c2a08ff34c180a83ec1de97064d80c68bf8141af2f4", + "sha256:a34be674fe74b35a67ce768cbb86b9350caa22c4b04f2eb0d868d9c01f6539d1", + "sha256:a3942e2d365f009e5e7839114fa315e1a2bcfea12b52064a28f1a7281862a2a7", + "sha256:a3dea7e1ac49e29306500a8627fa3eacabcc9e238d22495eea2d8e61de77065b", + "sha256:a84e0ae14d1efe782a9f143021c4e01d5ed986a140fe5070505cc5978eaf0592", + "sha256:a961713b7bb90671a7d601886f0d603c8276ae95c6c63baaf36957fddba6fa72", + "sha256:a998857af4fcd19920bdf5f30f0f1a23f38472a703d33e49168cd4fd32438377", + "sha256:aa32b51702a0b6e9fddc0d1dc66cb6ed6af112f1bba0cac2be9039546a862b5c", + "sha256:b0c32f0660bb21e810ffc1d3d04b6ea682e118b8141c6e12522a3dacadeb70ee", + "sha256:b0ee9e74480cb7393288ac2ed837e132200bfedd620e765e6db3a3192c9b5b9a", + "sha256:b0faa0b9af9367748388345d5b12f6add2a9cf896481e72910e88fbfe14ecd54", + "sha256:b5b458950312830913f837e179ce9221000ab7a20b4e42d7b48c1fcd79140de1", + "sha256:b8b2fc7901b31d5885f26521cf2d74feccdc126a272ba1d879b7545bb25468bc", + "sha256:b95809496769fb09777136f3e259433ac21c495f3517bf7aab7dfb5a95cfde8b", + "sha256:b9e56ed83aa2ad78496788afe87d830725a752deb590fa8b7c95e1105da21dc0", + "sha256:bd18576a758364b194e9347e0859362e158df99fb0dec3af480578fd9d92ae27", + "sha256:be371af72af54b6e508b68a7a87768e05b7e13023f6c82a3e3f5e4d0e829e186", + "sha256:bfb2d71edaaa0c6e0e51c52328154c635aec3ee6ea6a29271fbac1a8bc157c12", + "sha256:c3f667dc60a875b12a5ecd7828062ccd97c0fb79c4adc6c8699d23d5ff2af7e1", + "sha256:c4b68ce579b05c66bb18a16356a4f713bebac2446ee498dd8bb1ecab3da77b89", + "sha256:c4c82b91f512942db9bfb4f33ab6b8e17e49cba0e9e98ed34c0cf7c33a48a458", + "sha256:c5302747f969d5ec925810176f7697712a3fa2ea0fae0c7a85aa4ad9325247fd", + "sha256:c741ff72829507be41dc50c731565fa2413287e845e55f0661dedf0a942c1c31", + "sha256:c788fdab2eeeab671f5ab375ad010ef743f6c95be67f60f878e8876a51f6c671", + "sha256:cba95509120e059fb1a13089428bfba90535b0fa296890650137282a066d7db2", + "sha256:cc5eb1be95fb880bd083fb24df064bd5fc8caa85c05cf0ee5f33e2ddf9af625d", + "sha256:cd678af3f73bcacd0391897a8697e19ba4bd1445b35ba6d776342e64f8c98f29", + "sha256:cfa54e7f5bd5ef482e7f5336f7cf3c30ae608d9767e514dd930b7c30a03fa977", + "sha256:d6ef0035b6ae338a46951c144081c61fb044f4c1eb6d20acc5ba6277f666a4c0", + "sha256:d9ff3dcfaf60de01805e0268a29947205a71742e02797ef07ca46a58ab2a3390", + "sha256:dafaeb38712f99e5c31ad7f02c366f1ddd3792921b94066015f8c49f197163b0", + "sha256:dca1bf90b3a6a7440904f128464eb95bf46ac9da7ad3c85912483dd83128fd95", + "sha256:ddc832886517c5009863209a4a292c4353967cd304ba55822d533e0d59eb6a60", + "sha256:de1bf30d819809a964060356032e6670c9923644666afaaf3d1719d05ddb844e", + "sha256:de499e2492c8106a5e163d3cf5b6726e2797f9234cfbc6055fbb5f9d8f198f39", + "sha256:e4a7be59d374c445766fa4ac066a04d19a757365ae00a950053d0ab7388d1039", + "sha256:e6c4fa55eab6b5684b33239597876a18a35ce1280b63ab960164032afbb8783f", + "sha256:ea396d0ab0c9e082e009a16d7bda6849784b411b884d86e287a1b0a36eb278fb", + "sha256:eaa5178a4c1fe619eff9cbe93b57919d426332e219870301d4ef5fc09a522ae9", + "sha256:ecfb50c208c59d9a786262ab06ee25688d1ada618e48a442eb4a12b38835f294", + "sha256:ed62c15ce5e8b975b2710a0f7c8bb953cbffb472fccb05055be6afcba9520c19", + "sha256:ed8e452f5cb34f59f4861d50d029c6203b5f8f11c13d4186264392a64b4def8d", + "sha256:eea17e3cdc6f9aecffe15fe9a9eeba8e8c049a5d347de1561eed2240cdf35a79", + "sha256:f00ff4b56caf151365c77988eb85a4a71eb26fe63047d4084d5614e06d65e3cf", + "sha256:f06dd6a30438692d48c0d54de4b659cd55a57c2c2f6591c969c98d0a5523ab07", + "sha256:f20bec84117a324b6c4b679d2c748d2813df55e1fe181b3a6bcaa93b6719a772", + "sha256:f34405292fca45cd77419005c1ea35ba1c03eaff9042afe76d6fe189fe474669", + "sha256:f352f797b1477c46a20e45f4cbc3a0e258e61963c8ae8f79f84a7bfb4195b37e", + "sha256:f37ccd159dae35d4914651d57142c8077aa67ab7e3ffef690b00bcb7a7dbd8e6", + "sha256:f51bca8fcac4266519533698c316f3d23340768a8e57c4796c9f6e0a4f353807", + "sha256:f5342b8256476554b4045db8b7bf4dc4044d0405485f220f0cd80764bc0d7faf", + "sha256:f5fbda9703bce94a976e1a6bbdbbe0af25fb613a593a56091991359928b66c05", + "sha256:f760d9a9c441bfc87eee720ddb0946d3e19995b20983ae14038e033f1664efcb", + "sha256:f9e9f04e5cb640cf7bbf6fdd4e3970e821138df320ae85cad81b4efc2f5cc802", + "sha256:faa8520b1c2a3c8216065077e047f84b116405661b1ba070862dac82d464ef39", + "sha256:fb5df75d1b1c42d997adbb39eac61f2cdb48efa26304a0cb9c0b757c9bc20732", + "sha256:fb6a4d400aa531c73a718b337116fad77ba8dc6df34fa615c808bfc55ffb19ca", + "sha256:ff02e697d947f518e9e99f2b25698045a5ddffa95049c4d95b5a8cf3618d9008" ], "index": "pypi", - "version": "==1.2.0" + "version": "==1.2.1" }, "certifi": { "hashes": [ - "sha256:62f22742b58a1a33014a2b6b706588a8d7e2a88ae7bd1a6ebe8c992928483775", - "sha256:741e2c3b351ddf169a738da9f2c048608ff7f2c5cc02f1ebc6b118bb090d5d55" + "sha256:035c1e85572b141bf1c3a3eff0e33a8eb74917522f2559075ff8d2fea780a1ae", + "sha256:42d35340cc5b9ba78e818ddbff0c5b1c2b779de448a340fd1b989f5fa8670e1b" ], + "index": "pypi", "markers": "python_version >= '3.7'", - "version": "==2026.7.22" + "version": "==2026.10.19" }, "cffi": { "hashes": [ @@ -506,12 +550,12 @@ }, "filelock": { "hashes": [ - "sha256:2b155f098c4f285fb41954a22c616c4e8a0635b78c184338ba3023c1c91a4b4d", - "sha256:be9166068623636cedcad7b2ef735b04e5fb4344d978e09fd6fbd6ede06f14f0" + "sha256:7be2662e9e826b9bba28afc0f843a123280d799a2ea44bb5d35ccec67905ae44", + "sha256:c4c937ccac2a813cee448e662a56366cfb374c0f8702e75f295c412cc1c5d5a3" ], "index": "pypi", - "markers": "python_version >= '3.10'", - "version": "==4.0.5" + "markers": "python_version >= '3.11'", + "version": "==4.2.1" }, "flask": { "hashes": [ @@ -694,7 +738,8 @@ }, "mitmproxy": { "git": "https://github.com/citusdata/mitmproxy.git", - "ref": "a16444362cc0393ccf7329f50fc909b711729de7" + "markers": "python_version >= '3.12'", + "ref": "5cd63296e7dab274e275553df76e9699ea220032" }, "mitmproxy-linux": { "hashes": [ @@ -719,76 +764,101 @@ }, "msgpack": { "hashes": [ - "sha256:01e2dd6c9b19d333a00282330cc8a73d38d8dabc306dc5b42cd668c3ac82e833", - "sha256:020e881a764b20d8d7ca1a54fc01b8175519d108e3c3f194fddc200bda95951a", - "sha256:04c721c2c7448767e9e3f2520a475663d8ee0f09c31890f6d2bd70fd636a9647", - "sha256:05f340e47e7e47d2da8db9b53e1bb1d294369e9ef45a747441309f6650b8351d", - "sha256:0a70e3cf2804a300d921bb0940426e35f4e489a23adfb77a808892241db0a064", - "sha256:0adcf06ffde0777c0e1a9b771a2b1c4226ba1bbf748c8efcc02fcdeca3299107", - "sha256:0c0d9802354507bcba62af19c17918e3eb437cc25e6f50657d511b5856a77aac", - "sha256:0e2bf9280bceb5efca998435904b5d3e9fdbcc11d90dc9df30aec7973252b720", - "sha256:1233ee2dd0cefba127583de50ea654677277047d238303521db35def3d7b2e7c", - "sha256:146ee4e9ce80b365c6d4c47073da9da7bcec473e58194ceee5dd7620ace77e06", - "sha256:1548006a91aa93c5da81f3bdcebc1a0d10cea2d25969754fbe848da622b2b895", - "sha256:196300e7e5d6e74d50f1607ab9c06c4a1484c383cd22defd727902591f7e8dde", - "sha256:1dabedcd0f23559f3596428c6589c1cd8c6eaed3a0d720795b07b0225d769203", - "sha256:20466cca18c49c7292a8984bc15d65857b171e7264bdcb5f96baf8be238791fc", - "sha256:298872ecf9e61950f1c6af4ca969b859ee91783bb920ef6e6172697d0c8aad74", - "sha256:29a3f6e9667868429d8240dfd063ea5ffdc1321c13d783aa23827a38de0dcb22", - "sha256:2eda0b7ebb1283a98d3e4492ac933c8af6aff59fd3df1c3ed024f536af4b1dc8", - "sha256:2ef59c659f289eddf8aa6623823f19fa2f40a4029266889eac7a2505dd210c35", - "sha256:2ff164c1b0bcb740b073b99e945234d0212852fa378e44a208c425379140dbeb", - "sha256:33f14fba63278b714efe6ad07e50ea5f03d91537aa6a1c5f1ceca4cf44013ca9", - "sha256:350cb813d0af6e65d2f7ef0d729f7ff5be5a8bce03665892f43e5883d4ecc1b8", - "sha256:4202c74688ca06591f78cb18988228bd4cca2cc75d57b60008372892d2f1e6e6", - "sha256:4227224aaec8f7fbcbfbd4272319347b2bb4030366502600f8c45588c5187b07", - "sha256:491cc39455ca765fad51fb451bf2915eb2cf41192ab5801ce8d67c1d614fe056", - "sha256:575957e79cd51903a4e8495a242442949641e08f1efd5197b43bebd3ea7682b4", - "sha256:5ad5467fc3f68b5468e06c5f788d712e9f8ffc8b0cd1bcb160c105c1ee92dae7", - "sha256:5bb9c386f0a329c035ddbab4b72d1028bf9627add8dda41070288563d57ed1b1", - "sha256:5c24aa15d5963051e1a5c62b12c50cd705992502b5ec1f3bece6046f33c9fc24", - "sha256:5f6277e5f783c36786a145e0247fc189a03f35f84b251646e53592d2bc12b355", - "sha256:60926b75d00c8e816ef98f3034f484a8bc64242d66839cef4cf7e503142316a0", - "sha256:633727297ed063441fd1cda2288865487f33ad14eeb8831afb5f0c396a62cfce", - "sha256:67f6dd22fa72a93752643f07889796d62739a13415ee630169a8ce764f86cf9f", - "sha256:6d09badf350af2be9d189184e04e64cf54ad93569ab3d96fca58bd3e84aad707", - "sha256:6ee967f7c7e1df2890c671ff2ee51a28ded0efc95da3e507176dee881ce36c66", - "sha256:74847557e28ce71bd3c438a447ca90e4b507e997ddbdef8a12a7b283b86c156b", - "sha256:779197a6513bab3c3632265e3d0f7cb3227e62510841a6f34f1eaa37efbb345e", - "sha256:787c9bebb5833e8f6fc8abca3c0597683d8d87f56a8842b6b89c75a5f3176e2d", - "sha256:7d31c0ac0c640f877804c67cb2bc9f4e23dc2db97e96c2e67fa27d38283b41f8", - "sha256:810b916696c86ef0deb3b74588480224df4c1b071136c34183e4a2a4284d7ac7", - "sha256:83efa1c898e0fc5380fc0cabbf75164c52e3b5cbb45973710d75821928380c73", - "sha256:85f57e960d877f2977f6430896191b04a21f8901b3b4baf2e4604329f4db5402", - "sha256:8b267ce94efb76fbd1b3373511420074ee3187f0f7811bf394531de13294735a", - "sha256:8c2ed1e48cc0f460bf3c7780e7137ff21a4e18433451916f2442c1b21036cd7d", - "sha256:8c7b398c56ff125feae96c2737abfec5595f1fa0aa186df60c56040b8accb95c", - "sha256:8d00f177ca88a77c1cf848d204a38f249751650b601cb6532acc68805d8a8273", - "sha256:8ff92d7feeaf5bc26c51495b69e2f99ed97ab79346fb6555f44be7dd2ac6503b", - "sha256:91054a783328e0ea7954b8771095705c8d2243b814743fbaadf14552c9c52c5d", - "sha256:98b58bdb89c46190e4609bb36abe17c6d4105ad13f9c5f8f6f64d320f8ced3fb", - "sha256:a28d076ca7c82b9c8728ad90b7147489449557038bed50e4241eb832395169b4", - "sha256:aa6c4be5d1c02a42b066ca6ddb71adf36432868fdcdb6ee87e634e86e0674190", - "sha256:aded5bdf32609dc7987a49bbbd15a8ef096193f96dd8bbeb791de729e650acf5", - "sha256:afc5febcd4c99effbc02b528e49d6fd0760b2b7d48c05239e345a5fa6e743d9a", - "sha256:b50b727bd652bdc37d950336c848ef20ec54a4cafc38dce19b1cd86ad625d0f7", - "sha256:c1c79a604a2969a868a78b6ebd27a887e00c624f14f66b3038e0590cb23332d1", - "sha256:ca0dacff965c47afdc3749a8469d7302a8f801d6a28758d55120d75e66ce6889", - "sha256:d3567748a5107cb40cdf66a275430c2f87c07777698f4bfd25c35f44d533258c", - "sha256:dc871b997a9370d855b7394465f2f350e847a5b806dd38dcc9c989e7d87da155", - "sha256:dd3bfe82d53edfe4b7fc9a7ec9761e23a7a5b1dac22264505af428253c29ed24", - "sha256:e3dc2feb0876209d9c38aa56cb1de169bd6c4348f1aa48271f241226590993e6", - "sha256:e4f1d0f8f98ade9634e01fb704a408f9336c0a8f1117b369f5db83dc7551d8b1", - "sha256:ec0e675d59150a6269ddc9139087c722292664a37d071a849c05c473350f1f2d", - "sha256:ee1d9ed27d0497b848923746cf762ed2e7db24f4be7eec8e5cbe8c766aa707b7", - "sha256:f02cf17a6ca1abe29b5f980644f7551f94d71f2011509b26d8625ce038f0df64", - "sha256:f12038a35fabd52e56a3547bab42401af49a45caa6dd00b34c44de235bc93ee2", - "sha256:f310233ef7fb9c14e201c93639fe5f5260b005f56f0b29048e999c30935596cc", - "sha256:f9389552ecf4784886345ead0647e4edc96bee37cbab05b75540f542f766c48c" + "sha256:07c9733089d1b176c3dd2f7fa268452f9d5d784d076473499d754a58e8d1fbbb", + "sha256:0955b9000725573d1457c1676944b370dd9643c8d18f25bda5ac72913f850949", + "sha256:0c91762c48cd686dc9cf2b142c0bc544083952de32f5853d6624c956e54b85e5", + "sha256:0ed5823c4efc20fe87d3530665f40ec18a002be003114814c21235cc8d256207", + "sha256:13221a6c81ebb8e43ea63a7251c35d54e4175cea37ebf3a62e911bdf42562a3c", + "sha256:186e6c602b8a9968b8e864c67d622a69279f7d1e55ae25f40e3bff7e815b2b62", + "sha256:18a6ed513023001b28dcd3ba54966f6bb90a38274ba8d2640464bcab3a1b81d4", + "sha256:1d6bcec3dbbdb89ca385d3a73e63ceae7b841fa0d7ca7c676f1a7bfe7fb2cdb8", + "sha256:1f4ae8bd4ad9ba085fde95e95d055a896d19210238a4199a771a3cf36dceed49", + "sha256:1f585407f740a9eac04a3bb82c61d68a0ea78f90e29e670bfb086b9ce3a518dd", + "sha256:21bfa4d2aa0b04c1806ef778a1199e9e53ea2441bcbf284420a32083896320b8", + "sha256:2487453ca1b6104442c6442f9a1a8fee1fe8f428a70d99d4cba799108b304150", + "sha256:2574ef81c1c8c38b10e330f3f9406fd09198a776b002030fafcf8e7647e9e06e", + "sha256:30e1522e4173230dca4d9ad896f038f73c0da6c1edd42f4dbad88ac583cf5d46", + "sha256:32edb81a2b5eb7cd7c9d941b2bfbbb082fd2cd09e0e725930316af6b708db186", + "sha256:3372475211a9ce1a23acefe512cb3e121d18c95dc74ed56cb1819ef40836ebf4", + "sha256:382b219de3d436de3baba0f4b0c6d4336e8f5858d0eb047918b13b69a71c6c55", + "sha256:382bc88fe90f29f5ac8a0b65c7046ff255356f2f2f3186c30e370215736fa1dc", + "sha256:39b6986c19e1f2dfa549d185dba6ccf1de2e4c0ba10d8cfc0048935b1c5f9109", + "sha256:3a31905206722103a84c1f72633fe30692cff6732c9d262e09a27dbc468797c8", + "sha256:3d4c807ed050fe3ddbea5ba7e9f63d7136871ce42861be1f50ff739f0e91047a", + "sha256:3ec409b0d6aa8e9eec6eaf881b893caa215dbe68c5319ca96e8a271d81bb111d", + "sha256:471e12a6a42498a31490c206e0069e343b6a7c35db540be73a879eb06f5be047", + "sha256:4c0780095871ecc49a58b2ff6b1b43b25214704da67646557ca287a3f49fb2dd", + "sha256:59612b4ed48a04cf024584218e813562f3b30a3bafa5f55abe300b15da314751", + "sha256:5bd5f91ea75c45cafcc5433ba8fae59b708b736ec178d2441c40c499e9e079db", + "sha256:5bf390259cb25a6a1cd197c65810999b811f64cd38683251538bcc5a1e41f7d3", + "sha256:5c1efdd9181cb1b719ee46865f368a927f1c0c65d577798340b1194545b7515a", + "sha256:5e0d7950ca3c1bbae291d0552dd3bb2792fc680629c4c0d44e47e5bab969f3ca", + "sha256:5f304123b90e8b2e49867981b7f6061612c39f50cca51ee88de007c084cf68d3", + "sha256:62cc1a4ef0e553bac32c8342e1f04834aca7de276b92744eb7307db77759b890", + "sha256:63bb7448a1e9111319ae2430c09a5596140c160422830d6271bc75730ff2ff9a", + "sha256:6576f348ed6cc4f31db6fd915a8e94245f042f50eae08d48732425e70638ea37", + "sha256:666ef5601ab0e6e345e47febc96aa81143cc932201543480cbb9499164f05ffb", + "sha256:6707d2fa2aa1bb5424ea0b05f44ffc989b15ab41a73ff5855bff4944fec7c8ac", + "sha256:69ad12cedb674c73527bed869cddb42b742cac79a207a614202a4abaa24ea173", + "sha256:6a834097144aabe948b8ca9020a833e8026f7d0abbd0ec54bc7e50f45a8ce012", + "sha256:6df430419f2338cb71e4a34d6e64f83c88ccd321f91f40ba4513400b36d864ec", + "sha256:700bc0fc9e968a292b9137ee70e7a012f7e115bf0107ce45e3a88202788dfc1e", + "sha256:7013534a7163aa4f213c4d9864f1a8a7555daac6fcd48f699a198e29b436bfab", + "sha256:7995a7c6a62a1d6e7df211b4a16de513bd99fd053525050a319f80f44fb8015e", + "sha256:79dfa38faf92f804aa61beec140d70b18418e1dde1778dbb77a87a4cce85aa8a", + "sha256:7a003b02c6ee2eea6dfe0bb08818631e3597e69f0131f2a8250488a1cc553290", + "sha256:7c047250096f9fc19dba26e3d1639b5e7a84114003605c94def667149a70ced1", + "sha256:84a6616d396ec1bc18a1e83e67c96a393ec35dfe5e17434a5be7b9aa0fe988ab", + "sha256:87cf2ef05ff2f2493ba29fcdaef27e960ca64dacfd13460ae29e6f92e0ed05bb", + "sha256:89c930aece4e972b208ba589c8410b4167b05e411a5ea2cb25fd96f8bc47ee43", + "sha256:8ca67f77938ea6a3663aa9bd22b3e031f6da84d665be850abab910ee90728dfd", + "sha256:8e51eca14fbb65c4e0a5a9657346962bd3dca78c08e04e3d4dee70ef48687d30", + "sha256:8ec7a1d49ca6c2569d722ab5ec86e90089b0713900aa31905b47b4c4d9e78ce0", + "sha256:902f3490db0e07a7d40b48536a85c9b28fbf1397e7e1658a45a55f958e303620", + "sha256:905a189853d6bdb204c7ae5f4ab77fb857448abfff574d3d93c62e2815b24b4f", + "sha256:9276ba88891338f2617044429dfd080ae008c9868a25f6f1a7d004a35dc9ac0a", + "sha256:9324c54995641c3d1f92a9d55093c8cde0ffa2fbc87a467a688ef60428393220", + "sha256:968583e956d0427878050b371308c5f8647088732ef3e66a117dbe1192ec91e0", + "sha256:9d7e9cbb0998bbfd363fd9a09c330520d5e9cb323c05b5a1a05865d23ccf2226", + "sha256:a393e428f6ffb0dcb73308c1fff5593041c16ff42da66e5bac8a83a6107a54b0", + "sha256:a6b63917d60d6df451f328bd6afba8565e33c4afe1f62ec4ad758b78731c827b", + "sha256:b1631e12fe572e181cd77e831f69335d6cd5278eac22e3db3f33cf264ac2ac18", + "sha256:b774ff994d844e541439ac5d2d49a14def4104830c3465e9394c153f86200ffb", + "sha256:b949cc25e4a09252cbcc54e66e507de914d0e94a3a7039bd54c299bf7037c098", + "sha256:bb89b5dc30469c84bbf8684826eb851d82412ca95690e111b9ac5e8fb343961a", + "sha256:bfe7d5b62cbe7aa664f0b3e2c49077f10fcdd06183d3014f8271ff3c5edbfbf9", + "sha256:c309a7abae1d14ba29a8bd0ddbd704a5e469d8e9bd9c3dee0e4ff53d7ae01d56", + "sha256:c77e27790ad72989db783d5303825fba0b71550f00a490efba35cde7dc4b719f", + "sha256:c942c21a93f36b3a69e828c8945bb72c94dc2ffe488a2086950c812f3edf046c", + "sha256:ccea05b5542f6d283fef3f0a8e93a7f0be90af0ddeeef84c25c0216ba76dcae1", + "sha256:cd5a9f9f86a52c24713679aa2631956835f3842512964ff93f736ff76f1f530d", + "sha256:d0238cd05dec9ffbe0de1071df685ba63e30a36ac155285b1a094e727c38cbe9", + "sha256:d1c1e8989a855b7f1f2a64ec4a80b23a631822903952770813857b2e4f460471", + "sha256:d2f9c4f85e47a44d26d5baf3b041eef23436e224d44eed273f01bd8a12048d9f", + "sha256:d31864ba3933a589b6a00249f89c0eb422197f49128fc10da550e57e9cb0f377", + "sha256:d8ef3a66e4b52d2d7fdd90df2984670124b2ff7546d76bb25dcf68ef47f7df58", + "sha256:db84203b13aecc222f465061397fdd5b53b7ae73d2c95ffc1c8dc5be0153a709", + "sha256:db9fb67a3a2e75247bae569d34ebb5ff61c0448a4f0d6dbf991dae68af39b007", + "sha256:e0bd394e999949c814f7912284243298de1b5a17b6a3dcb6cc8a79b156ffc4fa", + "sha256:e15f70588f4db8cd10df0930145b186de70feb9db51710cd378b1399009655bd", + "sha256:e54394b7dbe2e12ab032d9d21feef7bb61a90a150a2623633ba3781ba69dcb1f", + "sha256:eaf7e82249837e3aa97297b34a0bb9ff562027381631e057cea6e1367f10b438", + "sha256:ec0030361cc861ac699b2ef1c695b741fa145c88f8667fa3d7e3f73deeb648a3", + "sha256:ec90a9ae3e1169fa1171147340f0e97d941aa19fcd3b34e8339a55933ed042af", + "sha256:ed899d73a22f286a72bd9528d63f2ab3030dbad8bf1527fc249319a50d61fb9d", + "sha256:ede33b2892ceb976283e009ad12fa1834cfdf1f9c43ee9c97849fc588d00a618", + "sha256:f24a43b3560e20f825b807fe1e874bd73d53abaf8bbdcf258a6eb152cddbc1f5", + "sha256:f3d7b3d0018746b5997dd6b14a1870b07cc4c327d9101145d94a1fc264a51a06", + "sha256:f41ca154b7737b11893cdce3c78c61d703398a1cd54d4297bdad908392338a8e", + "sha256:f42f146752eedb6765f07dcc04d72dab0a25779ec8d4a88c0085263ce114f22c", + "sha256:f56fba61b2516be7917cb00151f0d060b5b21184e3499bb57f0f7d9259bea124", + "sha256:f9ddd28d3e9bbc602a9dced1591882c7fb9ab776eef8837da2c326fde19e2853", + "sha256:fafc3b8898b432b841d30a61082c599fa7f4d06885f9dc58ad72259e12059fa6", + "sha256:fcc6800daac4922960f6eeb7a0dda3dd4105e0bf7bce0e83ebc465a78cb7bdba" ], "index": "pypi", "markers": "python_version >= '3.10'", - "version": "==1.2.1" + "version": "==1.2.3" }, "packaging": { "hashes": [ @@ -824,12 +894,12 @@ }, "pyasn1": { "hashes": [ - "sha256:9c447d8431c947fe4c8febc4ed9e760bc29011a5b01e5c74b67025bd9fb8ce81", - "sha256:deda9277cfd454080ec40b207fb6df82206a3a2688735233cdcd8d3d565f088b" + "sha256:4017b0fce125096b8573b39c989fdb1a4b19cf761e683398184550fea0e66587", + "sha256:6b11616a6bcf3a40e635f082bb232fa57b5e0dd7f517bd7ddd69ec3794508a47" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==0.6.4" + "version": "==0.6.5" }, "pycparser": { "hashes": [ @@ -1038,20 +1108,53 @@ }, "tornado": { "hashes": [ - "sha256:11881db6b7c168494be2c2d12e65931451bdf7ee718535418ae1d8855dd5a0ee", - "sha256:547d63f450d570c14fe0e8db2cfb14c9bbd1c2503b4a6612586267955aa47b58", - "sha256:5d242290bdf7ab3151bc1065fdd75c0dcc21cbc7b49f22a4c56329c2d6566d22", - "sha256:67832909c4779c64942380cb5f044a5c6163d00831472d80e25e115de9917836", - "sha256:68a7468c7e289f8514d7d664101753903217eff1bb6822c6b5994a0b5f5bcb26", - "sha256:7b94ff0e128fe0542f3bd331fb44d06260fc4ac16881545159f34ef08aad4195", - "sha256:7e2360a0ffbe145eca8af0b19cb7203d79b1a98dd4cccdd6b368f6f49c2e3808", - "sha256:9452e1b208a8bd771e2cb1f2ff564985b9b214bdebbe622793e1799e0a6bd23f", - "sha256:9715b5eb79735b2bcd454ce216a9275b7c0470e64ea1bf5742f78b2f72b26eeb", - "sha256:cc6aa787d7cfab7c3d35189dc7a56fbd2399a569624c730c6b55b3d6531d0403" + "sha256:01dc73e3697eb94d78c42e03931ab621da97d12fdfb6339e64ff5a934b220fcf", + "sha256:0223e827cedf4e35ebb035e57a0d9974563cd043e3a53f8bb72a859b6f53777e", + "sha256:065bc741478b168df9baf754956a3010c04d1330bb45a84833d807c29e11b257", + "sha256:08b808e8d3312c268f9fe1ffebfcfaaf342e7fe4ac40d219a7e1b58bac547d6f", + "sha256:0f0f596a0dab6826aa21d103c7bc242e3fb7cfc99c5c3d44a35ba8c83abbdca4", + "sha256:15443805d6b7aa11610cc6c5be7e71b4a93369aeb2ca5a13c2def53a3af5ba45", + "sha256:1b6ff57cc69b339f8feb9e7b567b0e0eacb16bfaf234159496623ef7a67ba640", + "sha256:25b2619274bca77d0eb7b4d96dcf2d1142bb9bf172ad6a7491a1e1f82e6e48fa", + "sha256:28e6311402af59c8b02e3fa0f5e7d8eb465b25081381803b127d97e6a4395d5a", + "sha256:29bce3190c2973fcd2171c95eeab8bf06d2f7a7eb107455ce3e4662c704aecdb", + "sha256:2fbfd2510b6163b189773155a8246c025cb260ccc7cd12ad18c36c54f5617bb9", + "sha256:3298fce72c35f836eab4c4db8b960104ff1ea718033a6b5e236f04efe3a1b6e1", + "sha256:3c35091add5863feb9cf651851bb1b23592f1f9551b5dfed72837c83ea4e5b85", + "sha256:4bc6c60faf86162df25ba2ff5611d27b6ef8226de9d61c07a0fab53c169630a5", + "sha256:510c7261ed986ecd6f74edc1a13412759e7abc2e8be3a6c85e15f6c53e1f3c84", + "sha256:533185c89be3ffb01656c9425da4ff42587a3af784b37d39fe762e8fce3b2dbe", + "sha256:54c80f9bed0bf1533ecf5a90dc59651645622d62b0bcffa2692d108a1f794917", + "sha256:58d2f47e7b54fded3407dbbbe4e59d29ca627f85bf6c0f21f0b151c6c7fc9c53", + "sha256:5cb82ca38596e1350fceaf994f287847f82f7b8436380d36ba0937a03107d0ee", + "sha256:60aad449dbcebaa8d69bff50c6ba39858fab8d256e779a99bb30ebf6724b9b48", + "sha256:6596f3e939962f13099ce8d1a96b83226e908ca369b193370a6efa84585a1601", + "sha256:71c16b382b22d3234913a3f74a1ea84bede197d11eb03871df17bb123088dfa5", + "sha256:77dd6e0c659fdc45824e0746988ac5c060c2a9fee9b8cbbcdb999b3f29d3cd10", + "sha256:872249311539281c1e8a5d8d6f27f478bf705a9bd931bf374b6b31b05177dfda", + "sha256:8cae3d8f2585be01670da9fd5010c61724c51b61ecd4c06820e95874739daf7c", + "sha256:8cd28b2cacbe63d53e28a38546a3492b488417eeb3f7ecf10954476fc2508882", + "sha256:8d475f4053c693b5c1483eb4845824129b0b51c65712e736b3c2ea1c8f6080cd", + "sha256:95bd4751357bef52aa655e236b9667ff054885de4b118e4ce9ba5c06e12ef5d0", + "sha256:a72f70b1aa630fa2106d39a025e2be75c272b7ec8233da94e2f407ea754cc32d", + "sha256:a8d3e6acde5a80d13b13b5e4c7c226ca682f31d0a62b6c33cea038714bc2de1b", + "sha256:b62fded687e55acaf9e36c1230b006066a35b3f6df093ba1fd3b2ff592070e1d", + "sha256:b777fbe0bdb2c4dc764aadf5f70e9b23b2e536c339d61c799d3ea1b575a7c285", + "sha256:b77ab23d1520c807d11e703e79b020d3bc3676a0f5ebc8531f46d3fac8aecb2f", + "sha256:b9ce0d6548bd73b1329075b247d3fdc61538922f558ee42059e08f5df53fc197", + "sha256:ca95e762df1ca761f330e3f2a034c15ac144569844b52527a5a9eca9f524c0f1", + "sha256:ce5a18654f5d56d11400ab5d87103660e14deceab41818a06a42acc8dbbe427d", + "sha256:d83bac141bd9360d8e995ec512097be19ead2e9213c3e7088510a036f3192b8d", + "sha256:da6ce2da215810d56539fa6cac77d9e27f4d8139c6868c53436b2fe933f43c79", + "sha256:e923e75c9d641cdb8bbac60070a2dccdb684fc555af2bff48b0eaded0f88c2dc", + "sha256:eb67ba2cbf598e842f14684eab029a5a4ba7ab587e8c4e40940a77ed0596b31e", + "sha256:ecef88054d8a77878f61061ff67dfc5e1c17d1f7334890ab508b310e8e68ee46", + "sha256:ed0bc5a1a9f6346e7bdadc106fa2d4c6e79d71d8b2df4366260ab3baf36a8399", + "sha256:fbaa022a49a27b65668592cf43b898ff3978cbe4e6926fdfe24dbef59053bd26" ], "index": "pypi", - "markers": "python_version >= '3.9'", - "version": "==6.5.8" + "markers": "python_version >= '3.11'", + "version": "==6.6.1" }, "typing-extensions": { "hashes": [ @@ -1064,11 +1167,12 @@ }, "urwid": { "hashes": [ - "sha256:58ddc5c65eb3109b69e2e95469553f9f86070645cc1b553d6ee3fe8dbac2e0ba", - "sha256:f6f0381d5656b8b24ee960969927021d858c1f7320771cf8f3ec5b94a139b9b7" + "sha256:b85618b42f48ce3028405002743238c511185439cb356c3c68190c44cde4778a", + "sha256:c31aff787741428028b20bac3b0774fbe4f10de00ae00fe07722244d09462248" ], + "index": "pypi", "markers": "python_full_version >= '3.9.0'", - "version": "==4.0.0" + "version": "==4.0.7" }, "wcwidth": { "hashes": [ @@ -1099,12 +1203,12 @@ }, "werkzeug": { "hashes": [ - "sha256:210c6bede5a420a913956b4791a7f4d6843a43b6fcee4dfa08a65e93007d0d25", - "sha256:7ddf3357bb9564e407607f988f683d72038551200c704012bb9a4c523d42f131" + "sha256:55ca7c70a75689be937aa27f8ff4b018f06ff4838fc73045560bf0f5a1291060", + "sha256:6392e50c78460ba618e5b21f08a71f59c99ce99cdc6cf6e3dd7e6ccca8754fab" ], "index": "pypi", "markers": "python_version >= '3.9'", - "version": "==3.1.6" + "version": "==3.1.9" }, "wsproto": { "hashes": [ @@ -1232,37 +1336,37 @@ }, "black": { "hashes": [ - "sha256:0126ae5b7c09957da2bdbd91a9ba1207453feada9e9fe51992848658c6c8e01c", - "sha256:0f76ff19ec5297dd8e66eb64deda23631e642c9393ab592826fd4bdc97a4bce7", - "sha256:28ef38aee69e4b12fda8dba75e21f9b4f979b490c8ac0baa7cb505369ac9e1ff", - "sha256:2bd5aa94fc267d38bb21a70d7410a89f1a1d318841855f698746f8e7f51acd1b", - "sha256:2c50f5063a9641c7eed7795014ba37b0f5fa227f3d408b968936e24bc0566b07", - "sha256:2d6bfaf7fd0993b420bed691f20f9492d53ce9a2bcccea4b797d34e947318a78", - "sha256:41cd2012d35b47d589cb8a16faf8a32ef7a336f56356babd9fcf70939ad1897f", - "sha256:474c27574d6d7037c1bc875a81d9be0a9a4f9ee95e62800dab3cfaadbf75acd5", - "sha256:5602bdb96d52d2d0672f24f6ffe5218795736dd34807fd0fd55ccd6bf206168b", - "sha256:5e9d0d86df21f2e1677cc4bd090cd0e446278bcbbe49bf3659c308c3e402843e", - "sha256:5ed0ca58586c8d9a487352a96b15272b7fa55d139fc8496b519e78023a8dab0a", - "sha256:6c54a4a82e291a1fee5137371ab488866b7c86a3305af4026bdd4dc78642e1ac", - "sha256:6e131579c243c98f35bce64a7e08e87fb2d610544754675d4a0e73a070a5aa3a", - "sha256:855822d90f884905362f602880ed8b5df1b7e3ee7d0db2502d4388a954cc8c54", - "sha256:86a8b5035fce64f5dcd1b794cf8ec4d31fe458cf6ce3986a30deb434df82a1d2", - "sha256:8a33d657f3276328ce00e4d37fe70361e1ec7614da5d7b6e78de5426cb56332f", - "sha256:92c0ec1f2cc149551a2b7b47efc32c866406b6891b0ee4625e95967c8f4acfb1", - "sha256:9a5e9f45e5d5e1c5b5c29b3bd4265dcc90e8b92cf4534520896ed77f791f4da5", - "sha256:afc622538b430aa4c8c853f7f63bc582b3b8030fd8c80b70fb5fa5b834e575c2", - "sha256:b07fc0dab849d24a80a29cfab8d8a19187d1c4685d8a5e6385a5ce323c1f015f", - "sha256:b5e6f89631eb88a7302d416594a32faeee9fb8fb848290da9d0a5f2903519fc1", - "sha256:bf9bf162ed91a26f1adba8efda0b573bc6924ec1408a52cc6f82cb73ec2b142c", - "sha256:c7e72339f841b5a237ff14f7d3880ddd0fc7f98a1199e8c4327f9a4f478c1839", - "sha256:ddb113db38838eb9f043623ba274cfaf7d51d5b0c22ecb30afe58b1bb8322983", - "sha256:dfdd51fc3e64ea4f35873d1b3fb25326773d55d2329ff8449139ebaad7357efb", - "sha256:f1cd08e99d2f9317292a311dfe578fd2a24b15dbce97792f9c4d752275c1fa56", - "sha256:f89f2ab047c76a9c03f78d0d66ca519e389519902fa27e7a91117ef7611c0568" + "sha256:03c0ddd93bb392e71209903a691767eb366fe1a76deb9509ccbaae9e1f14bb52", + "sha256:0ce08b367307b0fd91c9dd1d4084e62b05b3055475f951f0f34a46b6e2393b64", + "sha256:182f6c32be38074b16d378498c498b32cb51928178ee611485344972c35ec9c6", + "sha256:1935b32f5326028019856e18cb42b4da63db23765dc84464cec723e0de478a9b", + "sha256:19fa8f5beb5e77c54c9c7e21d00cc93ed6c8b6228ee385616906d6befe081143", + "sha256:2520037aa62f8a1454d0811b8f5c88b444445b03a4bfba480d8d220893b64c34", + "sha256:28842f9a8207cc1df6eb983a35a14c5a0dfcd603d214fe82d84bef552afd2e3a", + "sha256:289282aa2e09d3162312a3be1788ff21b08e9ea9cc4a81e656024728b32428fb", + "sha256:2ffbc023a12d0c729408823b8f10514490bd0baa301d0d4e21a7240249f9507f", + "sha256:3414a0c52901964dceabd98c7c56beac0f964115a116ecedcce7247359b14017", + "sha256:4d9a90516db1d99c25dbb20cc0998e0e01531dd903466c7744e56d66f864220a", + "sha256:51d5e417e700fe6ec0b0ecdc408c6f6cb5def80328f31f724993d82c6486b746", + "sha256:5cd88fd7b444ca51f3fc883b6f6657ea53a258b0b2eef6d9f2dfcfa17ce0e27b", + "sha256:5f9f83beae62437e060dafd53d7f1fc327e3d3494f74d72ee5c2b73eb90fc4e7", + "sha256:70ccbd175b7f6be29d2b727ee7ca6b4c54053df59da653a6df80b175d20a94fa", + "sha256:7bdade400bfe24d78a7762896acc2f9a8e1a17fb0fd0536bf6b7c7097cf3eec7", + "sha256:8375962579d537364cc0efa19b1474481915d3a793f9fc0774901814c5e5b5f4", + "sha256:978113a40223a6aaefc17364176a809a320e6b288683841427fff04c6d7b4130", + "sha256:9a0219b29cd70e49f920acb7081e6ce5025c719008447c521d0200dcad93206a", + "sha256:b5347d760f0c02bb00dd249384cab71c3bf828b4f68d5b401eb116e0390f147d", + "sha256:b6272cfd7e1e8e271f5b0e0207259fe2834687e5cb9b5f620b34a44db9754993", + "sha256:d42dd2fac7c342ae67e64ee99c9532e20b2a84e92c79ed3317fa2ef54c801d93", + "sha256:d5bd3518d8e97138fef295230b1e9804076d69fa4e3594071494a8c68abe6266", + "sha256:d8b3a9074a680b3c5749633714e9ae3992a1e5a23343a97ad61cd9b119b444d2", + "sha256:f6dba8138cdc99061ef07b958ac082d2aa057b6961d1936f9717c350f02bab5f", + "sha256:fe85fc4019bee59bc495c0f2a8ee76c5cd02c7015508d94a967ba2376f39a52c", + "sha256:ff57f63029aa1353fa8b1b0c8971fd88a6c92dc766608d2eee33ad2deb23270e" ], "index": "pypi", "markers": "python_version >= '3.10'", - "version": "==26.3.1" + "version": "==26.10.1" }, "click": { "hashes": [ diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 892d90eedb4..64d2a8fd172 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -35,12 +35,12 @@ jobs: pgupgrade_image_name: "ghcr.io/citusdata/pgupgradetester" style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.33" - sql_snapshot_pg_version: "18.6" - image_suffix: "-va0a5582" - pg17_version: '{ "major": "17", "full": "17.11" }' - pg18_version: '{ "major": "18", "full": "18.6" }' - pg19_version: '{ "major": "19", "full": "19rc1" }' - upgrade_pg_versions: "17.11-18.6-19rc1" + sql_snapshot_pg_version: "18.7" + image_suffix: "-dev-5f24c0d" + pg17_version: '{ "major": "17", "full": "17.12" }' + pg18_version: '{ "major": "18", "full": "18.7" }' + pg19_version: '{ "major": "19", "full": "19.0" }' + upgrade_pg_versions: "17.12-18.7-19.0" steps: # Since GHA jobs need at least one step we use a noop step here. - name: Set up parameters diff --git a/.github/workflows/nightly_arm64.yml b/.github/workflows/nightly_arm64.yml index d9dfee450e5..a2c28c645a6 100644 --- a/.github/workflows/nightly_arm64.yml +++ b/.github/workflows/nightly_arm64.yml @@ -43,7 +43,7 @@ jobs: name: Initialize parameters runs-on: ubuntu-24.04 outputs: - pg_versions: '[{ "major": "17", "full": "17.11" }, { "major": "18", "full": "18.6" }]' + pg_versions: '[{ "major": "17", "full": "17.12" }, { "major": "18", "full": "18.7" }]' steps: - name: Set up parameters run: echo 'noop' diff --git a/.github/workflows/nightly_cassert.yml b/.github/workflows/nightly_cassert.yml index a1c889ab994..b77272d658b 100644 --- a/.github/workflows/nightly_cassert.yml +++ b/.github/workflows/nightly_cassert.yml @@ -7,7 +7,7 @@ run-name: Nightly cassert (${{ github.ref_name }}) # asserts surface -- that is the intended signal, not a regression gate. # # The version matrix lives in the `params` job below (single source of truth, mirroring -# build_and_test.yml's params job, which pins 17.11 / 18.6 / 19rc1 and no longer builds PG16). +# build_and_test.yml's params job, which pins 17.12 / 18.7 / 19.0 and no longer builds PG16). on: schedule: @@ -34,9 +34,9 @@ jobs: name: Initialize parameters runs-on: ubuntu-24.04 outputs: - pg_versions: '[{ "major": "17", "full": "17.11" }, { "major": "18", "full": "18.6" }, { "major": "19", "full": "19rc1" }]' - pg_upgrade_pairs: '[{ "old": "17", "old_full": "17.11", "new": "18", "new_full": "18.6" }, { "old": "18", "old_full": "18.6", "new": "19", "new_full": "19rc1" }, { "old": "17", "old_full": "17.11", "new": "19", "new_full": "19rc1" }]' - citus_upgrade_pg: '[{ "major": "17", "full": "17.11" }, { "major": "18", "full": "18.6" }]' + pg_versions: '[{ "major": "17", "full": "17.12" }, { "major": "18", "full": "18.7" }, { "major": "19", "full": "19.0" }]' + pg_upgrade_pairs: '[{ "old": "17", "old_full": "17.12", "new": "18", "new_full": "18.7" }, { "old": "18", "old_full": "18.7", "new": "19", "new_full": "19.0" }, { "old": "17", "old_full": "17.12", "new": "19", "new_full": "19.0" }]' + citus_upgrade_pg: '[{ "major": "17", "full": "17.12" }, { "major": "18", "full": "18.7" }]' citus_old_version: "v14.0.1" # 14.0-1 chains to MASTER (15.0); 14.1 has no path to 15.0 yet steps: - name: Set up parameters diff --git a/src/backend/distributed/planner/deparse_shard_query.c b/src/backend/distributed/planner/deparse_shard_query.c index 7de96c5102b..a162673c35b 100644 --- a/src/backend/distributed/planner/deparse_shard_query.c +++ b/src/backend/distributed/planner/deparse_shard_query.c @@ -49,7 +49,6 @@ static void UpdateTaskQueryString(Query *query, Task *task); static RelationShard * FindRelationShard(Oid inputRelationId, List *relationShardList); -static void ConvertRteToSubqueryWithEmptyResult(RangeTblEntry *rte); static bool ShouldLazyDeparseQuery(Task *task); static char * DeparseTaskQuery(Task *task, Query *query); @@ -573,7 +572,7 @@ FindRelationShard(Oid inputRelationId, List *relationShardList) * ConvertRteToSubqueryWithEmptyResult converts given relation RTE into * subquery RTE that returns no results. */ -static void +void ConvertRteToSubqueryWithEmptyResult(RangeTblEntry *rte) { Relation relation = table_open(rte->relid, NoLock); @@ -620,6 +619,13 @@ ConvertRteToSubqueryWithEmptyResult(RangeTblEntry *rte) rte->rtekind = RTE_SUBQUERY; + /* + * Table references normally have inh set even when they have no children. + * This replacement is an ordinary empty subquery, not an append relation. + * Clear the table's flag so later planning does not mistake it for one. + */ + rte->inh = false; + /* no permission checking for this RTE */ rte->perminfoindex = 0; diff --git a/src/backend/distributed/planner/distributed_planner.c b/src/backend/distributed/planner/distributed_planner.c index 93046767a81..df8d5a1e7d3 100644 --- a/src/backend/distributed/planner/distributed_planner.c +++ b/src/backend/distributed/planner/distributed_planner.c @@ -15,7 +15,9 @@ #include "funcapi.h" #include "miscadmin.h" +#include "access/attmap.h" #include "access/htup_details.h" +#include "access/table.h" #include "access/xact.h" #include "catalog/pg_class.h" #include "catalog/pg_proc.h" @@ -32,10 +34,12 @@ #include "parser/parse_relation.h" #include "parser/parse_type.h" #include "parser/parsetree.h" +#include "rewrite/rewriteManip.h" #include "utils/builtins.h" #include "utils/datum.h" #include "utils/lsyscache.h" #include "utils/memutils.h" +#include "utils/rel.h" #include "utils/syscache.h" #include "utils/typcache.h" @@ -50,6 +54,7 @@ #include "distributed/commands.h" #include "distributed/coordinator_protocol.h" #include "distributed/cte_inline.h" +#include "distributed/deparse_shard_query.h" #include "distributed/distributed_planner.h" #include "distributed/function_call_delegation.h" #include "distributed/insert_select_planner.h" @@ -81,6 +86,36 @@ static uint64 NextPlanId = 1; /* keep track of planner call stack levels */ int PlannerLevel = 0; +static void PostPGPlanNormalization(Query *originalQuery, Query *query); + +#if PG_VERSION_NUM >= PG_VERSION_16 +typedef struct RemovedOuterJoinContext +{ + Bitmapset *referencedIdentities; + List *rangeTableList; + Bitmapset *removedIdentities; +} RemovedOuterJoinContext; + +static bool CollectReferencedRelationIdentities(Node *node, Bitmapset **identities); +static bool ReplaceRemovedOuterJoinRelations(Node *node, + RemovedOuterJoinContext *context); +static Bitmapset * RemovedOuterJoinRelationIndexes(Node *node, Query *query, + RemovedOuterJoinContext *context, + bool nullable); +static bool ReplaceRemovedOuterJoinRelationCopies(Node *node, + Bitmapset *removedIdentities); +static void ConvertRemovedOuterJoinRelation(Query *query, Index rteIndex); +#if PG_VERSION_NUM >= PG_VERSION_19 +static Node * RemapRemovedOuterJoinVar(const Var *var, + replace_rte_variables_context *context); +#else +static Node * RemapRemovedOuterJoinVar(Var *var, + replace_rte_variables_context *context); +#endif +static void RemapRemovedOuterJoinColumns(Node *node, Query *query, Index rteIndex, + AttrMap *attributeMap); +#endif + static bool ListContainsDistributedTableRTE(List *rangeTableList, bool *maybeHasForeignDistributedTable); static bool PlanContainsDistributedSubPlanRTE(DistributedPlanningContext *planContext); @@ -135,8 +170,7 @@ static void PopPlannerRestrictionContext(void); static void ResetPlannerRestrictionContext(PlannerRestrictionContext * plannerRestrictionContext); static PlannedStmt * PlanFastPathDistributedStmt(DistributedPlanningContext *planContext); -static PlannedStmt * PlanDistributedStmt(DistributedPlanningContext *planContext, - int rteIdCounter); +static PlannedStmt * PlanDistributedStmt(DistributedPlanningContext *planContext); static RTEListProperties * GetRTEListProperties(List *rangeTableList); static List * TranslatedVars(PlannerInfo *root, int relationIndex); static void WarnIfListHasForeignDistributedTable(List *rangeTableList); @@ -294,6 +328,14 @@ distributed_planner(Query *parse, copyObject(planContext.originalQuery->jointree); } #endif + if (needsDistributedPlanning) + { + /* PostgreSQL may have inlined additional relation RTEs. */ + AssignRTEIdentities(ExtractRangeTableEntryList(planContext.query), + rteIdCounter); + PostPGPlanNormalization(planContext.originalQuery, planContext.query); + } + #if PG_VERSION_NUM >= PG_VERSION_18 if (needsDistributedPlanning) { @@ -310,7 +352,7 @@ distributed_planner(Query *parse, if (needsDistributedPlanning) { - result = PlanDistributedStmt(&planContext, rteIdCounter); + result = PlanDistributedStmt(&planContext); } else if ((result = TryToDelegateFunctionCall(&planContext)) == NULL) { @@ -757,13 +799,9 @@ PlanFastPathDistributedStmt(DistributedPlanningContext *planContext) * planner. */ static PlannedStmt * -PlanDistributedStmt(DistributedPlanningContext *planContext, - int rteIdCounter) +PlanDistributedStmt(DistributedPlanningContext *planContext) { - /* may've inlined new relation rtes */ List *rangeTableList = ExtractRangeTableEntryList(planContext->query); - rteIdCounter = AssignRTEIdentities(rangeTableList, rteIdCounter); - PlannedStmt *result = CreateDistributedPlannedStmt(planContext); @@ -1243,6 +1281,8 @@ CreateDistributedPlan(uint64 planId, bool allowRecursivePlanning, Query *origina standard_planner(newQuery, NULL, 0, boundParams); + PostPGPlanNormalization(originalQuery, newQuery); + /* overwrite the old transformed query with the new transformed query */ *query = *newQuery; @@ -3109,4 +3149,325 @@ DisableSelfJoinElimination(void) } +#endif + + +/* + * Reconcile the original query with PostgreSQL's join removal before resuming + * distributed planning. Relations introduced by PostgreSQL must have identities. + */ +static void +PostPGPlanNormalization(Query *originalQuery, Query *query) +{ +#if PG_VERSION_NUM >= PG_VERSION_16 + if (originalQuery->commandType == CMD_SELECT) + { + RemovedOuterJoinContext context = { 0 }; + context.rangeTableList = ExtractRangeTableEntryList(query); + CollectReferencedRelationIdentities((Node *) query, + &context.referencedIdentities); + ReplaceRemovedOuterJoinRelations((Node *) originalQuery, &context); + if (!bms_is_empty(context.removedIdentities)) + { + ReplaceRemovedOuterJoinRelationCopies((Node *) query, + context.removedIdentities); + } + } +#endif +} + + +#if PG_VERSION_NUM >= PG_VERSION_16 +static bool +CollectReferencedRelationIdentities(Node *node, Bitmapset **identities) +{ + if (node == NULL) + { + return false; + } + + if (IsA(node, Query)) + { + Query *query = (Query *) node; + List *indexes = NIL; + ExtractRangeTableIndexWalker((Node *) query->jointree, &indexes); + + ListCell *cell = NULL; + foreach(cell, indexes) + { + RangeTblEntry *rte = rt_fetch(lfirst_int(cell), query->rtable); + if (rte->rtekind == RTE_RELATION) + { + *identities = bms_add_member(*identities, GetRTEIdentity(rte)); + } + } + + return query_tree_walker(query, CollectReferencedRelationIdentities, + identities, 0); + } + + return expression_tree_walker(node, CollectReferencedRelationIdentities, identities); +} + + +static bool +ReplaceRemovedOuterJoinRelations(Node *node, RemovedOuterJoinContext *context) +{ + if (node == NULL) + { + return false; + } + + if (IsA(node, Query)) + { + Query *query = (Query *) node; + Bitmapset *rteIndexes = RemovedOuterJoinRelationIndexes((Node *) query->jointree, + query, context, false); + int rteIndex = -1; + while ((rteIndex = bms_next_member(rteIndexes, rteIndex)) >= 0) + { + ConvertRemovedOuterJoinRelation(query, rteIndex); + } + bms_free(rteIndexes); + return query_tree_walker(query, ReplaceRemovedOuterJoinRelations, context, 0); + } + + return expression_tree_walker(node, ReplaceRemovedOuterJoinRelations, context); +} + + +/* + * PostgreSQL 16.16 can remove outer joins from the transformed jointree. + * The original tree is still used for deparsing and recursive planning. Keep + * its join structure and aliases, but replace eliminated distributed relations + * with empty subqueries so later planning cannot reintroduce them. + */ +static Bitmapset * +RemovedOuterJoinRelationIndexes(Node *node, Query *query, + RemovedOuterJoinContext *context, bool nullable) +{ + Bitmapset *rteIndexes = NULL; + if (IsA(node, RangeTblRef) && nullable) + { + Index rteIndex = ((RangeTblRef *) node)->rtindex; + RangeTblEntry *rte = rt_fetch(rteIndex, query->rtable); + if (rte->rtekind == RTE_RELATION && + IsCitusTableType(rte->relid, DISTRIBUTED_TABLE) && + !bms_is_member(GetRTEIdentity(rte), context->referencedIdentities)) + { + int identity = GetRTEIdentity(rte); + RangeTblEntry *transformedRte = NULL; + + /* A missing relation may have been recursively planned, not eliminated. */ + foreach_declared_ptr(transformedRte, context->rangeTableList) + { + if (transformedRte->rtekind == RTE_RELATION && + GetRTEIdentity(transformedRte) == identity) + { + context->removedIdentities = bms_add_member( + context->removedIdentities, identity); + return bms_make_singleton(rteIndex); + } + } + } + } + else if (IsA(node, FromExpr)) + { + Node *child = NULL; + foreach_declared_ptr(child, ((FromExpr *) node)->fromlist) + { + rteIndexes = bms_join(rteIndexes, + RemovedOuterJoinRelationIndexes(child, query, context, + nullable)); + } + } + else if (IsA(node, JoinExpr)) + { + JoinExpr *join = (JoinExpr *) node; + + /* + * A whole joined subtree can be on the nullable side of an outer join. + * PostgreSQL can reduce a FULL join to LEFT or RIGHT before removing + * it, so either side of a FULL join may have been eliminated. + */ + bool leftNullable = nullable || join->jointype == JOIN_RIGHT || + join->jointype == JOIN_FULL; + bool rightNullable = nullable || join->jointype == JOIN_LEFT || + join->jointype == JOIN_FULL; + rteIndexes = RemovedOuterJoinRelationIndexes(join->larg, query, context, + leftNullable); + rteIndexes = bms_join(rteIndexes, + RemovedOuterJoinRelationIndexes(join->rarg, query, context, + rightNullable)); + } + return rteIndexes; +} + + +/* + * Replace the corresponding relations in PostgreSQL's transformed query. + * Re-fetch RTEs by index because reference remapping can copy the query. + */ +static bool +ReplaceRemovedOuterJoinRelationCopies(Node *node, Bitmapset *removedIdentities) +{ + if (node == NULL) + { + return false; + } + + if (IsA(node, Query)) + { + Query *query = (Query *) node; + for (Index rteIndex = 1; rteIndex <= list_length(query->rtable); rteIndex++) + { + RangeTblEntry *rte = rt_fetch(rteIndex, query->rtable); + if (rte->rtekind == RTE_RELATION && + bms_is_member(GetRTEIdentity(rte), removedIdentities)) + { + ConvertRemovedOuterJoinRelation(query, rteIndex); + } + } + return query_tree_walker(query, ReplaceRemovedOuterJoinRelationCopies, + removedIdentities, 0); + } + + return expression_tree_walker(node, ReplaceRemovedOuterJoinRelationCopies, + removedIdentities); +} + + +/* + * Construct a dense empty subquery and map physical attribute numbers to its + * output positions. Repair the containing query before replacing another RTE. + * + * Replacing a table with an empty subquery needs to remove dropped-column gaps; + * table attributes may occupy positions 2/3/4 while subquery outputs must be + * numbered 1/2/3. This function updates aliases, column references, and parent + * join mappings, preventing shifted names. Doing that repair here ensures that + * we produce a consistent query without having to modify PostgreSQL's versioned + * deparsers. + */ +static void +ConvertRemovedOuterJoinRelation(Query *query, Index rteIndex) +{ + RangeTblEntry *rte = rt_fetch(rteIndex, query->rtable); + AttrMap *attributeMap = make_attrmap(list_length(rte->eref->colnames)); + Relation relation = table_open(rte->relid, NoLock); + TupleDesc tupleDescriptor = RelationGetDescr(relation); + List *columnNames = NIL; + + Assert(attributeMap->maplen <= tupleDescriptor->natts); + for (int attributeIndex = 0; attributeIndex < attributeMap->maplen; attributeIndex++) + { + if (!TupleDescAttr(tupleDescriptor, attributeIndex)->attisdropped) + { + columnNames = lappend(columnNames, + list_nth(rte->eref->colnames, attributeIndex)); + attributeMap->attnums[attributeIndex] = list_length(columnNames); + } + } + table_close(relation, NoLock); + + ConvertRteToSubqueryWithEmptyResult(rte); + + /* A stored query need not include subsequently added table columns. */ + rte->subquery->targetList = list_truncate(rte->subquery->targetList, + list_length(columnNames)); + int resno = 0; + TargetEntry *targetEntry = NULL; + foreach_declared_ptr(targetEntry, rte->subquery->targetList) + { + targetEntry->resno = ++resno; + } + rte->eref->colnames = columnNames; + rte->alias->colnames = copyObject(columnNames); + + /* + * Remap even without dropped-column gaps: whole-row and system-column + * Vars must become NULL constants, since an empty subquery cannot supply them. + */ + Query *remappedQuery = (Query *) replace_rte_variables((Node *) query, rteIndex, 0, + RemapRemovedOuterJoinVar, + attributeMap, NULL); + *query = *remappedQuery; + RemapRemovedOuterJoinColumns((Node *) query->jointree, query, rteIndex, attributeMap); + free_attrmap(attributeMap); +} + + +static Node * +#if PG_VERSION_NUM >= PG_VERSION_19 +RemapRemovedOuterJoinVar(const Var *var, replace_rte_variables_context *context) +#else +RemapRemovedOuterJoinVar(Var * var, replace_rte_variables_context * context) +#endif +{ + AttrMap *attributeMap = context->callback_arg; + + /* An empty relation cannot supply a whole row or a system column. */ + if (var->varattno <= 0) + { + return (Node *) makeNullConst(var->vartype, var->vartypmod, var->varcollid); + } + + if (var->varattno > attributeMap->maplen || + attributeMap->attnums[var->varattno - 1] == 0) + { + elog(ERROR, "unexpected attribute number %d in removed outer join relation", + var->varattno); + } + + Var *mappedVar = (Var *) copyObject(var); + mappedVar->varattno = attributeMap->attnums[var->varattno - 1]; + if (mappedVar->varnosyn == var->varno) + { + mappedVar->varattnosyn = mappedVar->varattno; + } + return (Node *) mappedVar; +} + + +static void +RemapRemovedOuterJoinColumns(Node *node, Query *query, Index rteIndex, + AttrMap *attributeMap) +{ + if (IsA(node, FromExpr)) + { + Node *child = NULL; + foreach_declared_ptr(child, ((FromExpr *) node)->fromlist) + { + RemapRemovedOuterJoinColumns(child, query, rteIndex, attributeMap); + } + } + else if (IsA(node, JoinExpr)) + { + JoinExpr *join = (JoinExpr *) node; + List *columnNumbers = NIL; + if (IsA(join->larg, RangeTblRef) && + ((RangeTblRef *) join->larg)->rtindex == rteIndex) + { + RangeTblEntry *joinRte = rt_fetch(join->rtindex, query->rtable); + columnNumbers = joinRte->joinleftcols; + } + else if (IsA(join->rarg, RangeTblRef) && + ((RangeTblRef *) join->rarg)->rtindex == rteIndex) + { + RangeTblEntry *joinRte = rt_fetch(join->rtindex, query->rtable); + columnNumbers = joinRte->joinrightcols; + } + + ListCell *cell = NULL; + foreach(cell, columnNumbers) + { + int attributeNumber = lfirst_int(cell); + Assert(attributeNumber > 0 && attributeNumber <= attributeMap->maplen); + lfirst_int(cell) = attributeMap->attnums[attributeNumber - 1]; + } + RemapRemovedOuterJoinColumns(join->larg, query, rteIndex, attributeMap); + RemapRemovedOuterJoinColumns(join->rarg, query, rteIndex, attributeMap); + } +} + + #endif diff --git a/src/backend/distributed/utils/citus_depended_object.c b/src/backend/distributed/utils/citus_depended_object.c index 82ac76d4ce8..14717a1e8f2 100644 --- a/src/backend/distributed/utils/citus_depended_object.c +++ b/src/backend/distributed/utils/citus_depended_object.c @@ -50,6 +50,7 @@ #include "distributed/listutils.h" #include "distributed/log_utils.h" #include "distributed/metadata_cache.h" +#include "distributed/query_utils.h" #include "distributed/shared_library_init.h" /* @@ -273,7 +274,21 @@ HideCitusDependentObjectsOnQueriesOfPgMetaTables(Node *node, void *context) rangeTableEntry->securityQuals = lappend(rangeTableEntry->securityQuals, citusDependentObjExpr); #else - if (!mergeJoinCondition) + + /* + * A meta table on the nullable side of an outer join can be + * removed by join removal, and the filter must run when scanning + * it, so that the outer join null-extends a row whose only match + * is a hidden object instead of removing the row. Use security + * quals there, as PG19 does. Elsewhere keep the WHERE clause. + */ + if (RangeTableEntryIsOnNullableSideOfOuterJoin(query, varno)) + { + rangeTableEntry->securityQuals = + lappend(rangeTableEntry->securityQuals, + citusDependentObjExpr); + } + else if (!mergeJoinCondition) { query->jointree->quals = make_and_qual( query->jointree->quals, citusDependentObjExpr); diff --git a/src/backend/distributed/utils/query_utils.c b/src/backend/distributed/utils/query_utils.c index ac33bdd523f..a9ac8fc3dfb 100644 --- a/src/backend/distributed/utils/query_utils.c +++ b/src/backend/distributed/utils/query_utils.c @@ -22,6 +22,8 @@ static bool CitusQueryableRangeTableRelation(RangeTblEntry *rangeTableEntry); +static bool FindRangeTableEntryInJoinTree(Node *node, Index rangeTableIndex, + bool *isNullable); /* * ExtractRangeTableList walks over a tree to gather entries. @@ -178,3 +180,64 @@ ExtractRangeTableIndexWalker(Node *node, List **rangeTableIndexList) return walkerResult; } + + +/* + * RangeTableEntryIsOnNullableSideOfOuterJoin returns true if an outer join in + * the query's jointree can null-extend the relation at rangeTableIndex. + * + * A filter that hides rows of such a relation must be applied when scanning + * the relation. If it is added to the WHERE clause instead, it removes the + * joined row rather than null-extending it, which changes the query result. + */ +bool +RangeTableEntryIsOnNullableSideOfOuterJoin(Query *query, Index rangeTableIndex) +{ + bool isNullable = false; + FindRangeTableEntryInJoinTree((Node *) query->jointree, rangeTableIndex, + &isNullable); + return isNullable; +} + + +static bool +FindRangeTableEntryInJoinTree(Node *node, Index rangeTableIndex, bool *isNullable) +{ + if (IsA(node, RangeTblRef)) + { + return ((RangeTblRef *) node)->rtindex == rangeTableIndex; + } + else if (IsA(node, FromExpr)) + { + Node *fromNode = NULL; + foreach_declared_ptr(fromNode, ((FromExpr *) node)->fromlist) + { + if (FindRangeTableEntryInJoinTree(fromNode, rangeTableIndex, isNullable)) + { + return true; + } + } + + return false; + } + else if (IsA(node, JoinExpr)) + { + JoinExpr *join = (JoinExpr *) node; + bool inLeft = FindRangeTableEntryInJoinTree(join->larg, rangeTableIndex, + isNullable); + bool inRight = !inLeft && + FindRangeTableEntryInJoinTree(join->rarg, rangeTableIndex, + isNullable); + + if ((inLeft && (join->jointype == JOIN_RIGHT || join->jointype == JOIN_FULL)) || + (inRight && (join->jointype == JOIN_LEFT || join->jointype == JOIN_FULL))) + { + *isNullable = true; + } + + return inLeft || inRight; + } + + elog(ERROR, "unrecognized join tree node type: %d", (int) nodeTag(node)); + return false; +} diff --git a/src/backend/distributed/worker/worker_shard_visibility.c b/src/backend/distributed/worker/worker_shard_visibility.c index 02a9ae3e664..ce5ec804757 100644 --- a/src/backend/distributed/worker/worker_shard_visibility.c +++ b/src/backend/distributed/worker/worker_shard_visibility.c @@ -27,6 +27,7 @@ #include "distributed/local_executor.h" #include "distributed/metadata_cache.h" #include "distributed/query_colocation_checker.h" +#include "distributed/query_utils.h" #include "distributed/worker_protocol.h" #include "distributed/worker_shard_visibility.h" @@ -474,11 +475,22 @@ FilterShardsFromPgclass(Node *node, void *context) /* add relation_is_a_known_shard(oid) IS NOT TRUE to the quals of the query */ Node *newQual = CreateRelationIsAKnownShardFilter(varno); + if (RangeTableEntryIsOnNullableSideOfOuterJoin(query, varno)) + { + /* + * Filter shards when scanning pg_class, so that the outer join + * null-extends a row whose only match is a shard instead of + * removing the row. + */ + rangeTableEntry->securityQuals = + lappend(rangeTableEntry->securityQuals, newQual); + } + /* * In PG17, MERGE queries introduce a new struct `mergeJoinCondition`. * We need to handle this condition safely. */ - if (query->mergeJoinCondition != NULL) + else if (query->mergeJoinCondition != NULL) { /* Add the filter to mergeJoinCondition */ query->mergeJoinCondition = (Node *) makeBoolExpr( diff --git a/src/include/distributed/deparse_shard_query.h b/src/include/distributed/deparse_shard_query.h index 490a05f4f1d..34e92f19ba3 100644 --- a/src/include/distributed/deparse_shard_query.h +++ b/src/include/distributed/deparse_shard_query.h @@ -31,6 +31,7 @@ extern bool UpdateWhereClauseToPushdownRecurringOuterJoinWalker(Node *node, List *relationShardList); Node * CreateQualsForShardInterval(RelationShard *relationShard, int attnum, int outerRtIndex); +extern void ConvertRteToSubqueryWithEmptyResult(RangeTblEntry *rte); extern void SetTaskQueryIfShouldLazyDeparse(Task *task, Query *query); extern void SetTaskQueryString(Task *task, char *queryString); extern void SetTaskQueryStringList(Task *task, List *queryStringList); diff --git a/src/include/distributed/query_utils.h b/src/include/distributed/query_utils.h index 0b216d158c7..3503d0fba10 100644 --- a/src/include/distributed/query_utils.h +++ b/src/include/distributed/query_utils.h @@ -39,4 +39,7 @@ extern bool ExtractRangeTableEntryWalker(Node *node, List **rangeTableList); extern bool ExtractRangeTableIndexWalker(Node *node, List **rangeTableIndexList); +extern bool RangeTableEntryIsOnNullableSideOfOuterJoin(Query *query, + Index rangeTableIndex); + #endif /* QUERY_UTILS_H */ diff --git a/src/test/regress/Pipfile b/src/test/regress/Pipfile index 58f4950f076..f7ce1fe22dd 100644 --- a/src/test/regress/Pipfile +++ b/src/test/regress/Pipfile @@ -4,35 +4,37 @@ url = "https://pypi.python.org/simple" verify_ssl = true [packages] -pyasn1 = ">=0.6.4" -mitmproxy = {git = "https://github.com/citusdata/mitmproxy.git", ref = "a16444362cc0393ccf7329f50fc909b711729de7"} +pyasn1 = ">=0.6.5" +mitmproxy = {git = "https://github.com/citusdata/mitmproxy.git", ref = "5cd63296e7dab274e275553df76e9699ea220032"} "aioquic" = ">=1.2.0,<1.3.0" "mitmproxy-rs" = ">=0.12.6,<0.13.0" argon2-cffi = ">=23.1.0" bcrypt = ">=4.1.2" -brotli = "<=1.2.0" +brotli = "==1.2.1" h11 = "==0.16.0" h2 = "==4.4.1" -tornado = ">=6.5.8,<6.6.0" -msgpack = ">=1.2.1" +tornado = "==6.6.1" +msgpack = "==1.2.3" +urwid = "==4.0.7" zstandard = ">=0.25.0" construct = "*" docopt = "==0.6.2" cryptography = "==50.0.0" pytest = "==9.0.3" psycopg = "*" -filelock = "*" +filelock = "==4.2.1" +certifi = "==2026.10.19" pytest-asyncio = "*" pytest-timeout = "*" pytest-xdist = "*" pytest-repeat = "*" pyyaml = "*" -werkzeug = "==3.1.6" +werkzeug = "==3.1.9" "typing-extensions" = ">=4.13.2,<5" pyperclip = "==1.9.0" [dev-packages] -black = "==26.3.1" +black = "==26.10.1" isort = "*" flake8 = "*" flake8-bugbear = "*" diff --git a/src/test/regress/Pipfile.lock b/src/test/regress/Pipfile.lock index 47c332fc96d..21c3e663581 100644 --- a/src/test/regress/Pipfile.lock +++ b/src/test/regress/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "2ba804b49514faf026f3ebdb7ac55402c538f9808a86af4e2945f557e951c09d" + "sha256": "d8533030a737a9566052eddc84718b1a04438e4171e49c68d29b2f02013f22d0" }, "pipfile-spec": 6, "requires": { @@ -201,117 +201,161 @@ }, "brotli": { "hashes": [ - "sha256:022426c9e99fd65d9475dce5c195526f04bb8be8907607e27e747893f6ee3e24", - "sha256:072e7624b1fc4d601036ab3f4f27942ef772887e876beff0301d261210bca97f", - "sha256:09ac247501d1909e9ee47d309be760c89c990defbb2e0240845c892ea5ff0de4", - "sha256:0bbd5b5ccd157ae7913750476d48099aaf507a79841c0d04a9db4415b14842de", - "sha256:0cf8c3b8ba93d496b2fae778039e2f5ecc7cff99df84df337ca31d8f2252896c", - "sha256:14ef29fc5f310d34fc7696426071067462c9292ed98b5ff5a27ac70a200e5470", - "sha256:15b33fe93cedc4caaff8a0bd1eb7e3dab1c61bb22a0bf5bdfdfd97cd7da79744", - "sha256:1b1d6a4efedd53671c793be6dd760fcf2107da3a52331ad9ea429edf0902f27a", - "sha256:1b557b29782a643420e08d75aea889462a4a8796e9a6cf5621ab05a3f7da8ef2", - "sha256:1b71754d5b6eda54d16fbbed7fce2d8bc6c052a1b91a35c320247946ee103502", - "sha256:1ce223652fd4ed3eb2b7f78fbea31c52314baecfac68db44037bb4167062a937", - "sha256:1e68cdf321ad05797ee41d1d09169e09d40fdf51a725bb148bff892ce04583d7", - "sha256:260d3692396e1895c5034f204f0db022c056f9e2ac841593a4cf9426e2a3faca", - "sha256:26e8d3ecb0ee458a9804f47f21b74845cc823fd1bb19f02272be70774f56e2a6", - "sha256:2881416badd2a88a7a14d981c103a52a23a276a553a8aacc1346c2ff47c8dc17", - "sha256:29b7e6716ee4ea0c59e3b241f682204105f7da084d6254ec61886508efeb43bc", - "sha256:2a7f1d03727130fc875448b65b127a9ec5d06d19d0148e7554384229706f9d1b", - "sha256:2d39b54b968f4b49b5e845758e202b1035f948b0561ff5e6385e855c96625971", - "sha256:2e1ad3fda65ae0d93fec742a128d72e145c9c7a99ee2fcd667785d99eb25a7fe", - "sha256:3173e1e57cebb6d1de186e46b5680afbd82fd4301d7b2465beebe83ed317066d", - "sha256:3219bd9e69868e57183316ee19c84e03e8f8b5a1d1f2667e1aa8c2f91cb061ac", - "sha256:350c8348f0e76fff0a0fd6c26755d2653863279d086d3aa2c290a6a7251135dd", - "sha256:35d382625778834a7f3061b15423919aa03e4f5da34ac8e02c074e4b75ab4f84", - "sha256:3b90b767916ac44e93a8e28ce6adf8d551e43affb512f2377c732d486ac6514e", - "sha256:3e1b35d56856f3ed326b140d3c6d9db91740f22e14b06e840fe4bb1923439a18", - "sha256:3ebe801e0f4e56d17cd386ca6600573e3706ce1845376307f5d2cbd32149b69a", - "sha256:3f3c908bcc404c90c77d5a073e55271a0a498f4e0756e48127c35d91cf155947", - "sha256:40d918bce2b427a0c4ba189df7a006ac0c7277c180aee4617d99e9ccaaf59e6a", - "sha256:465a0d012b3d3e4f1d6146ea019b5c11e3e87f03d1676da1cc3833462e672fb0", - "sha256:4735a10f738cb5516905a121f32b24ce196ab82cfc1e4ba2e3ad1b371085fd46", - "sha256:4ecdb3b6dc36e6d6e14d3a1bdc6c1057c8cbf80db04031d566eb6080ce283a48", - "sha256:50b1b799f45da91292ffaa21a473ab3a3054fa78560e8ff67082a185274431c8", - "sha256:54a50a9dad16b32136b2241ddea9e4df159b41247b2ce6aac0b3276a66a8f1e5", - "sha256:5732eff8973dd995549a18ecbd8acd692ac611c5c0bb3f59fa3541ae27b33be3", - "sha256:598e88c736f63a0efec8363f9eb34e5b5536b7b6b1821e401afcb501d881f59a", - "sha256:640fe199048f24c474ec6f3eae67c48d286de12911110437a36a87d7c89573a6", - "sha256:66c02c187ad250513c2f4fce973ef402d22f80e0adce734ee4e4efd657b6cb64", - "sha256:67a91c5187e1eec76a61625c77a6c8c785650f5b576ca732bd33ef58b0dff49c", - "sha256:6be67c19e0b0c56365c6a76e393b932fb0e78b3b56b711d180dd7013cb1fd984", - "sha256:6c12dad5cd04530323e723787ff762bac749a7b256a5bece32b2243dd5c27b21", - "sha256:71a66c1c9be66595d628467401d5976158c97888c2c9379c034e1e2312c5b4f5", - "sha256:7274942e69b17f9cef76691bcf38f2b2d4c8a5f5dba6ec10958363dcb3308a0a", - "sha256:7547369c4392b47d30a3467fe8c3330b4f2e0f7730e45e3103d7d636678a808b", - "sha256:7a47ce5c2288702e09dc22a44d0ee6152f2c7eda97b3c8482d826a1f3cfc7da7", - "sha256:7a61c06b334bd99bc5ae84f1eeb36bfe01400264b3c352f968c6e30a10f9d08b", - "sha256:7ad8cec81f34edf44a1c6a7edf28e7b7806dfb8886e371d95dcf789ccd4e4982", - "sha256:7e9053f5fb4e0dfab89243079b3e217f2aea4085e4d58c5c06115fc34823707f", - "sha256:7fa18d65a213abcfbb2f6cafbb4c58863a8bd6f2103d65203c520ac117d1944b", - "sha256:81da1b229b1889f25adadc929aeb9dbc4e922bd18561b65b08dd9343cfccca84", - "sha256:82676c2781ecf0ab23833796062786db04648b7aae8be139f6b8065e5e7b1518", - "sha256:832c115a020e463c2f67664560449a7bea26b0c1fdd690352addad6d0a08714d", - "sha256:844a8ceb8483fefafc412f85c14f2aae2fb69567bf2a0de53cdb88b73e7c43ae", - "sha256:865cedc7c7c303df5fad14a57bc5db1d4f4f9b2b4d0a7523ddd206f00c121a16", - "sha256:88ef7d55b7bcf3331572634c3fd0ed327d237ceb9be6066810d39020a3ebac7a", - "sha256:898be2be399c221d2671d29eed26b6b2713a02c2119168ed914e7d00ceadb56f", - "sha256:8d4f47f284bdd28629481c97b5f29ad67544fa258d9091a6ed1fda47c7347cd1", - "sha256:92edab1e2fd6cd5ca605f57d4545b6599ced5dea0fd90b2bcdf8b247a12bd190", - "sha256:9322b9f8656782414b37e6af884146869d46ab85158201d82bab9abbcb971dc7", - "sha256:95db242754c21a88a79e01504912e537808504465974ebb92931cfca2510469e", - "sha256:963a08f3bebd8b75ac57661045402da15991468a621f014be54e50f53a58d19e", - "sha256:96fbe82a58cdb2f872fa5d87dedc8477a12993626c446de794ea025bbda625ea", - "sha256:99cfa69813d79492f0e5d52a20fd18395bc82e671d5d40bd5a91d13e75e468e8", - "sha256:9c79f57faa25d97900bfb119480806d783fba83cd09ee0b33c17623935b05fa3", - "sha256:9e5825ba2c9998375530504578fd4d5d1059d09621a02065d1b6bfc41a8e05ab", - "sha256:9fe11467c42c133f38d42289d0861b6b4f9da31e8087ca2c0d7ebb4543625526", - "sha256:a1778532b978d2536e79c05dac2d8cd857f6c55cd0c95ace5b03740824e0e2f1", - "sha256:a387225a67f619bf16bd504c37655930f910eb03675730fc2ad69d3d8b5e7e92", - "sha256:a56ef534b66a749759ebd091c19c03ef81eb8cd96f0d1d16b59127eaf1b97a12", - "sha256:aa47441fa3026543513139cb8926a92a8e305ee9c71a6209ef7a97d91640ea03", - "sha256:ac27a70bda257ae3f380ec8310b0a06680236bea547756c277b5dfe55a2452a8", - "sha256:acec55bb7c90f1dfc476126f9711a8e81c9af7fb617409a9ee2953115343f08d", - "sha256:adedc4a67e15327dfdd04884873c6d5a01d3e3b6f61406f99b1ed4865a2f6d28", - "sha256:af43b8711a8264bb4e7d6d9a6d004c3a2019c04c01127a868709ec29962b6036", - "sha256:b232029d100d393ae3c603c8ffd7e3fe6f798c5e28ddca5feabb8e8fdb732997", - "sha256:b35c13ce241abdd44cb8ca70683f20c0c079728a36a996297adb5334adfc1c44", - "sha256:b63daa43d82f0cdabf98dee215b375b4058cce72871fd07934f179885aad16e8", - "sha256:b908d1a7b28bc72dfb743be0d4d3f8931f8309f810af66c906ae6cd4127c93cb", - "sha256:ba76177fd318ab7b3b9bf6522be5e84c2ae798754b6cc028665490f6e66b5533", - "sha256:bba6e7e6cfe1e6cb6eb0b7c2736a6059461de1fa2c0ad26cf845de6c078d16c8", - "sha256:c0d6770111d1879881432f81c369de5cde6e9467be7c682a983747ec800544e2", - "sha256:c16ab1ef7bb55651f5836e8e62db1f711d55b82ea08c3b8083ff037157171a69", - "sha256:c1702888c9f3383cc2f09eb3e88b8babf5965a54afb79649458ec7c3c7a63e96", - "sha256:c25332657dee6052ca470626f18349fc1fe8855a56218e19bd7a8c6ad4952c49", - "sha256:c8565e3cdc1808b1a34714b553b262c5de5fbda202285782173ec137fd13709f", - "sha256:cf9cba6f5b78a2071ec6fb1e7bd39acf35071d90a81231d67e92d637776a6a63", - "sha256:d206a36b4140fbb5373bf1eb73fb9de589bb06afd0d22376de23c5e91d0ab35f", - "sha256:d2d085ded05278d1c7f65560aae97b3160aeb2ea2c0b3e26204856beccb60888", - "sha256:d8c05b1dfb61af28ef37624385b0029df902ca896a639881f594060b30ffc9a7", - "sha256:e310f77e41941c13340a95976fe66a8a95b01e783d430eeaf7a2f87e0a57dd0a", - "sha256:e7c0af964e0b4e3412a0ebf341ea26ec767fa0b4cf81abb5e897c9338b5ad6a3", - "sha256:e80a28f2b150774844c8b454dd288be90d76ba6109670fe33d7ff54d96eb5cb8", - "sha256:e813da3d2d865e9793ef681d3a6b66fa4b7c19244a45b817d0cceda67e615990", - "sha256:e85190da223337a6b7431d92c799fca3e2982abd44e7b8dec69938dcc81c8e9e", - "sha256:e99befa0b48f3cd293dafeacdd0d191804d105d279e0b387a32054c1180f3161", - "sha256:eda5a6d042c698e28bda2507a89b16555b9aa954ef1d750e1c20473481aff675", - "sha256:ef87b8ab2704da227e83a246356a2b179ef826f550f794b2c52cddb4efbd0196", - "sha256:f16dace5e4d3596eaeb8af334b4d2c820d34b8278da633ce4a00020b2eac981c", - "sha256:f8d635cafbbb0c61327f942df2e3f474dde1cff16c3cd0580564774eaba1ee13", - "sha256:fc1530af5c3c275b8524f2e24841cbe2599d74462455e9bae5109e9ff42e9361", - "sha256:ff09cd8c5eec3b9d02d2408db41be150d8891c5566addce57513bf546e3d6c6d" + "sha256:0023348c448140a6ea71615eba331835c971d38ae8acf8a89b4e963b1f38f131", + "sha256:00a50d063aae2e69c2eb28818ccf6dc3e51f2ea5b74e3c2082a47943ee23f399", + "sha256:00c9a4262dd81cdc32968f8bc2482c735ad238010d95b49698f1b788c359c7a4", + "sha256:02b2f7b5a83485efe448a44ddf7983def05c3bb1dcf917d4f7154070260e13de", + "sha256:035f3bf861328d8b7fcb61f4a976f9913027158e5666116733d59ffc65f2745e", + "sha256:06a22fcbcae059c0679098232779095fc50a735a3fea02db5c79cab10b84d877", + "sha256:09a2f112a638aca15a88f298571788795fc45d62f2bca7f3870c1152153ef399", + "sha256:09b560859a04d112d206639c7e444161ee2f413098aa6de11d43daf3ce883d24", + "sha256:0a30e5df5ba985b67f85e13dfd7e5a68e186d8d9b5cff7d9a8904832bb413e81", + "sha256:0c5c6144aa4b4585e4e0b3595f9fb2743a2e32650bce4b2669a0e809b3e7bbbd", + "sha256:103b4762941760ae245d8d0d50e3ee4a7e034fcd786f122d177f76d6afc90c63", + "sha256:104d3504678db9172de523bdd8e6ab8d3643067fbde18e5b89476f405b64cf25", + "sha256:11aec6ea5c20cad61a33302e06baa48b0243bfa4d173bc2985dabd047e367d08", + "sha256:1329c80daa60752f1d94f507479504921e358e71746c5fce9b55b3d51ac038bc", + "sha256:1624ca7006d2776cc8f0313e62d63aef9d3720b66f0d24e4439f5d754488e001", + "sha256:1880db6241276e191d3e34a6e4eea708c6629103c396f0ea21e75b0ce63a9a2c", + "sha256:1f5d8c6e68555b82692f8180ee646cd1752aa9ab98daf68769a7c56a6e8d7af7", + "sha256:1f65a91f3576949793b8720b12a47e7ea06debc970a2da6d54ff8458053e2109", + "sha256:228abf241b39925450ea5046cbd8bc88ae1b91cd229037b0e194409df4ef2f4a", + "sha256:23f0d23995100458d17f3bf5ce1e959fe46df894b472063a74266f7adeb2e72e", + "sha256:24a3f765167e6ecac3d85a9fe3da857a068097cf44abc08bd67c5681d8251bca", + "sha256:25d7c19ea92df4be1358126b6712209ac58229d17af915397d1510f9efe0411d", + "sha256:264fd5b200f6f6170cb551a4b9fcaabf8aa846ddaefe72db4d5f49f9d3743df9", + "sha256:2df1678c2c25db2f669c613fe8b4e587d0dd24c6acf7746bad13d6e87e4b051d", + "sha256:304ee5bf4f85b719f6a274fa0b50d86b39b5dd1219f4cc61410d4eae315757a9", + "sha256:32567555e2e0040c596beb7f5f2ef69da6bf224aee4617c2a52099248dd3e243", + "sha256:338856ae9ff63af4fc3dbbd6184a7276a6ae83df2243562e86e5ee5cf980cce7", + "sha256:37de1818ce469b3c37324c89d4d4dbb5e64461d9dc01c16f8abb2a17c465b132", + "sha256:390f5e174ac2296dafd047d0785591e61194ff3df11ad43abd2fddb0e750eff5", + "sha256:3975fb11f63e212b87a087e4a910187b522c6969a4989ca362d6f85f9dc36acd", + "sha256:3b7df499157279a4d5d83ab86bd328c58c9ccfc48f5de45d4e791d3234a54dff", + "sha256:4092027deb7313156d2b601fb0e3637cbdf9d598f5bd57dc57348432967ecd31", + "sha256:457f011c135263900805b4bf0dd290724d277785656c32e4f5fefe4a1feede1e", + "sha256:4583e4d11d40fa4a05b7d81cd822008d65bce755dd78c49945b5a98272953759", + "sha256:461daaef60db39e407a6a6954a2b4804170db56c6212c009a6cdadbdd12d7a9b", + "sha256:4839f1a1ec3a95671238b2a165eba7a0a823090913ab4fc48aa03dc6f666dd02", + "sha256:49de36a626557629db1f9b1eb57e7d88f3815a42373ff7f9d8b87c1da120687e", + "sha256:4acd709bfe362c2ed80da311d195654467110bc747de1484c731304810fd20e5", + "sha256:4b9dd0173ca5e01d1eb307d3c184fe8c09bdc168ede560889b1018d216d38c61", + "sha256:4d47a9f0ba5ee608f3f3a9c942dcd244443068ae5b0d90183dd396dea02236e4", + "sha256:4e89a05511f8538911d98566f6ddd0883f28a5ab35fefbd70c036ab630feae1b", + "sha256:4f94a73b5f30b8bb36ac684f2b6a6e9bdc58a9b4bfe1658592727369443bce93", + "sha256:50248e2f05c8335089b9c2a80ebb4a8b5833a3581a433438b523e2341f45e681", + "sha256:509ee1058937d80d88b33aa893ca46e1925779d928181916bd60bda3a8738687", + "sha256:59ca34c7a83d7a3b842247183c426f891a95a8f57db41b7aac92195c51e8a83a", + "sha256:59ec359a56f44277ad424fb4b7cf1a0ae2fd855b35ba8f15dcfbcabb3fb51aeb", + "sha256:5c77d41984e388c9f393da124394af941ef757fb33bb6f1eb72e8167fc557489", + "sha256:5da5cb778a7fc889f72bd2238ddf39b9f7e8b0979ccefd760380f1c24bd9f33b", + "sha256:5f3da70516b1bd1b2aa183ec4ab5c02dfc6ad5c1184d47bb65ade25e710439b6", + "sha256:624240d21823e1805425c155fe8b35b4124e0a837eb8ea271bd0a54caeac4ef6", + "sha256:6532d2c58018121a9eb5882656cf862cdbbd853600cb5fbccac59bcff14f66b0", + "sha256:66f171af80744c06f6b4e5b01fe6e40c70cc4e17570888746a281422fed83fc0", + "sha256:67f4dceb22ce3a742751cee849644449b169684699aa548e77d771de304e963c", + "sha256:6b3c3d5794212a54434b4856f808f7bdf7ad48eacadaadb5b2346fc9a639365a", + "sha256:6b885b6b1a3b01c5980dddeb2d9dccbc5a5dc0f255ea15904bf585b73ef375a1", + "sha256:6bd29ab84bb8972370cacd310e8a91651f54476d01de1cd1a4cf0bece5eb25e1", + "sha256:6beca755e6b691096a398df587f544c3f8ff6e9e3a8119d90eae37872a829382", + "sha256:6f83664d0e48fd22114dd5ca2cd5202743a7b75b5e6e3fbc6ed61489cee749c8", + "sha256:7248c282d7d6aef4ae89363da5fc3df7b9250eb04b252622955296eb5d0ea82f", + "sha256:727c922e0e8511e22a7f3c81fbcce0aeebc8c7cdb7bd8f13f505394ea9865dcf", + "sha256:761db18dc32b24d00fbedca1013089eb3470053cefa8492bd9c07b11102d72bf", + "sha256:76b11b4af067c2b55ffde313ae978d8ab51cfa65046bb70de23448c9dc4e18c4", + "sha256:77ef5882c5318ffc3dd94c6abc6a8f1ec2af75d66522319f1a250a07d53d0546", + "sha256:77fe6845833339ff6c54be391b56dc5fcff9e7a9acdf7df54647d27e5d3afdd2", + "sha256:78c9b5c2cceaeb158d56d03ba9336b3d310c64da6d304296ba39b6c00b8840c1", + "sha256:7a553fffd70a518916ce5b595b3067a55c0357732b4f0a96db2dce70a4db717b", + "sha256:7aa24d49840c016a8256adb1f104f4e064ed9fa7d97523675dd50e08c05b143d", + "sha256:7c0f9fcfa54570222eb4cbece2fc44b71de3710e0ea6e075bc0ffdc8965ca1ac", + "sha256:7ec678c52c3ef5e37482a094d109c04cf9e4a0e2923dd1e0fbddb4bf133a976e", + "sha256:7f38649a7711c301ee231e296e0c8f14376a9d4f9ea7369ecc3cb22187813d9e", + "sha256:810aea5958d6a2d92593fd27218df528644aeb72cc7f6d401e650752d6c98949", + "sha256:81f289389af277345b85aea4b36f4ed2bbdf7504d4466cbec7d28702c4926b01", + "sha256:87492842770cd772fce25e9cd279913eaea6c55a91a960b6302aedfa2ec7b152", + "sha256:875975f91870682cca4371260522ad3f22d636e845b5c5355c52bc045c0f75c8", + "sha256:90bd49511341dd7c40bb3acaa97cd8b9e5df4821a5714b842117e7069c7cc03e", + "sha256:91097d66ebb8ca8d23372081a33405a44e2239445614888e38929bd7f5879dae", + "sha256:9307679936e86d7773eadfa444a4a4ee80f6f45230e93379875f4a6897a09a2b", + "sha256:93269f11303fc9a3e3990b57e0533f41949546156d9f0e535571f313032563cc", + "sha256:96e6966edcfae74ffac2522d2dd1a304450d18807a9791f5ed0a3232192c9437", + "sha256:970a3dbce807a3f5c2b8232036052bade01e4bc92ade37d73ea3750418307fa1", + "sha256:972a2e19dbaab47d0aa77c1d07f71c930bdc53538f2b33decc905e92a4be5cbd", + "sha256:972e34c5cbbfe6c90358bfae38edae1a29d3456e920da5a4664c98f221ee4df8", + "sha256:9acd83184eed969a08c1afa404a202a3f4287e3580781f2a36e927d4f25363fd", + "sha256:9f9aba3f8d2e3c22cf233d9bf2c2cfc050989d9da627802845df317d7ab33e84", + "sha256:a151eca7da2b04b6bed1f70138b50f5634704b98ee3ee63046316d7661f21b75", + "sha256:a26384540c88b7c157899c2a08ff34c180a83ec1de97064d80c68bf8141af2f4", + "sha256:a34be674fe74b35a67ce768cbb86b9350caa22c4b04f2eb0d868d9c01f6539d1", + "sha256:a3942e2d365f009e5e7839114fa315e1a2bcfea12b52064a28f1a7281862a2a7", + "sha256:a3dea7e1ac49e29306500a8627fa3eacabcc9e238d22495eea2d8e61de77065b", + "sha256:a84e0ae14d1efe782a9f143021c4e01d5ed986a140fe5070505cc5978eaf0592", + "sha256:a961713b7bb90671a7d601886f0d603c8276ae95c6c63baaf36957fddba6fa72", + "sha256:a998857af4fcd19920bdf5f30f0f1a23f38472a703d33e49168cd4fd32438377", + "sha256:aa32b51702a0b6e9fddc0d1dc66cb6ed6af112f1bba0cac2be9039546a862b5c", + "sha256:b0c32f0660bb21e810ffc1d3d04b6ea682e118b8141c6e12522a3dacadeb70ee", + "sha256:b0ee9e74480cb7393288ac2ed837e132200bfedd620e765e6db3a3192c9b5b9a", + "sha256:b0faa0b9af9367748388345d5b12f6add2a9cf896481e72910e88fbfe14ecd54", + "sha256:b5b458950312830913f837e179ce9221000ab7a20b4e42d7b48c1fcd79140de1", + "sha256:b8b2fc7901b31d5885f26521cf2d74feccdc126a272ba1d879b7545bb25468bc", + "sha256:b95809496769fb09777136f3e259433ac21c495f3517bf7aab7dfb5a95cfde8b", + "sha256:b9e56ed83aa2ad78496788afe87d830725a752deb590fa8b7c95e1105da21dc0", + "sha256:bd18576a758364b194e9347e0859362e158df99fb0dec3af480578fd9d92ae27", + "sha256:be371af72af54b6e508b68a7a87768e05b7e13023f6c82a3e3f5e4d0e829e186", + "sha256:bfb2d71edaaa0c6e0e51c52328154c635aec3ee6ea6a29271fbac1a8bc157c12", + "sha256:c3f667dc60a875b12a5ecd7828062ccd97c0fb79c4adc6c8699d23d5ff2af7e1", + "sha256:c4b68ce579b05c66bb18a16356a4f713bebac2446ee498dd8bb1ecab3da77b89", + "sha256:c4c82b91f512942db9bfb4f33ab6b8e17e49cba0e9e98ed34c0cf7c33a48a458", + "sha256:c5302747f969d5ec925810176f7697712a3fa2ea0fae0c7a85aa4ad9325247fd", + "sha256:c741ff72829507be41dc50c731565fa2413287e845e55f0661dedf0a942c1c31", + "sha256:c788fdab2eeeab671f5ab375ad010ef743f6c95be67f60f878e8876a51f6c671", + "sha256:cba95509120e059fb1a13089428bfba90535b0fa296890650137282a066d7db2", + "sha256:cc5eb1be95fb880bd083fb24df064bd5fc8caa85c05cf0ee5f33e2ddf9af625d", + "sha256:cd678af3f73bcacd0391897a8697e19ba4bd1445b35ba6d776342e64f8c98f29", + "sha256:cfa54e7f5bd5ef482e7f5336f7cf3c30ae608d9767e514dd930b7c30a03fa977", + "sha256:d6ef0035b6ae338a46951c144081c61fb044f4c1eb6d20acc5ba6277f666a4c0", + "sha256:d9ff3dcfaf60de01805e0268a29947205a71742e02797ef07ca46a58ab2a3390", + "sha256:dafaeb38712f99e5c31ad7f02c366f1ddd3792921b94066015f8c49f197163b0", + "sha256:dca1bf90b3a6a7440904f128464eb95bf46ac9da7ad3c85912483dd83128fd95", + "sha256:ddc832886517c5009863209a4a292c4353967cd304ba55822d533e0d59eb6a60", + "sha256:de1bf30d819809a964060356032e6670c9923644666afaaf3d1719d05ddb844e", + "sha256:de499e2492c8106a5e163d3cf5b6726e2797f9234cfbc6055fbb5f9d8f198f39", + "sha256:e4a7be59d374c445766fa4ac066a04d19a757365ae00a950053d0ab7388d1039", + "sha256:e6c4fa55eab6b5684b33239597876a18a35ce1280b63ab960164032afbb8783f", + "sha256:ea396d0ab0c9e082e009a16d7bda6849784b411b884d86e287a1b0a36eb278fb", + "sha256:eaa5178a4c1fe619eff9cbe93b57919d426332e219870301d4ef5fc09a522ae9", + "sha256:ecfb50c208c59d9a786262ab06ee25688d1ada618e48a442eb4a12b38835f294", + "sha256:ed62c15ce5e8b975b2710a0f7c8bb953cbffb472fccb05055be6afcba9520c19", + "sha256:ed8e452f5cb34f59f4861d50d029c6203b5f8f11c13d4186264392a64b4def8d", + "sha256:eea17e3cdc6f9aecffe15fe9a9eeba8e8c049a5d347de1561eed2240cdf35a79", + "sha256:f00ff4b56caf151365c77988eb85a4a71eb26fe63047d4084d5614e06d65e3cf", + "sha256:f06dd6a30438692d48c0d54de4b659cd55a57c2c2f6591c969c98d0a5523ab07", + "sha256:f20bec84117a324b6c4b679d2c748d2813df55e1fe181b3a6bcaa93b6719a772", + "sha256:f34405292fca45cd77419005c1ea35ba1c03eaff9042afe76d6fe189fe474669", + "sha256:f352f797b1477c46a20e45f4cbc3a0e258e61963c8ae8f79f84a7bfb4195b37e", + "sha256:f37ccd159dae35d4914651d57142c8077aa67ab7e3ffef690b00bcb7a7dbd8e6", + "sha256:f51bca8fcac4266519533698c316f3d23340768a8e57c4796c9f6e0a4f353807", + "sha256:f5342b8256476554b4045db8b7bf4dc4044d0405485f220f0cd80764bc0d7faf", + "sha256:f5fbda9703bce94a976e1a6bbdbbe0af25fb613a593a56091991359928b66c05", + "sha256:f760d9a9c441bfc87eee720ddb0946d3e19995b20983ae14038e033f1664efcb", + "sha256:f9e9f04e5cb640cf7bbf6fdd4e3970e821138df320ae85cad81b4efc2f5cc802", + "sha256:faa8520b1c2a3c8216065077e047f84b116405661b1ba070862dac82d464ef39", + "sha256:fb5df75d1b1c42d997adbb39eac61f2cdb48efa26304a0cb9c0b757c9bc20732", + "sha256:fb6a4d400aa531c73a718b337116fad77ba8dc6df34fa615c808bfc55ffb19ca", + "sha256:ff02e697d947f518e9e99f2b25698045a5ddffa95049c4d95b5a8cf3618d9008" ], "index": "pypi", - "version": "==1.2.0" + "version": "==1.2.1" }, "certifi": { "hashes": [ - "sha256:62f22742b58a1a33014a2b6b706588a8d7e2a88ae7bd1a6ebe8c992928483775", - "sha256:741e2c3b351ddf169a738da9f2c048608ff7f2c5cc02f1ebc6b118bb090d5d55" + "sha256:035c1e85572b141bf1c3a3eff0e33a8eb74917522f2559075ff8d2fea780a1ae", + "sha256:42d35340cc5b9ba78e818ddbff0c5b1c2b779de448a340fd1b989f5fa8670e1b" ], + "index": "pypi", "markers": "python_version >= '3.7'", - "version": "==2026.7.22" + "version": "==2026.10.19" }, "cffi": { "hashes": [ @@ -506,12 +550,12 @@ }, "filelock": { "hashes": [ - "sha256:2b155f098c4f285fb41954a22c616c4e8a0635b78c184338ba3023c1c91a4b4d", - "sha256:be9166068623636cedcad7b2ef735b04e5fb4344d978e09fd6fbd6ede06f14f0" + "sha256:7be2662e9e826b9bba28afc0f843a123280d799a2ea44bb5d35ccec67905ae44", + "sha256:c4c937ccac2a813cee448e662a56366cfb374c0f8702e75f295c412cc1c5d5a3" ], "index": "pypi", - "markers": "python_version >= '3.10'", - "version": "==4.0.5" + "markers": "python_version >= '3.11'", + "version": "==4.2.1" }, "flask": { "hashes": [ @@ -694,7 +738,8 @@ }, "mitmproxy": { "git": "https://github.com/citusdata/mitmproxy.git", - "ref": "a16444362cc0393ccf7329f50fc909b711729de7" + "markers": "python_version >= '3.12'", + "ref": "5cd63296e7dab274e275553df76e9699ea220032" }, "mitmproxy-linux": { "hashes": [ @@ -719,76 +764,101 @@ }, "msgpack": { "hashes": [ - "sha256:01e2dd6c9b19d333a00282330cc8a73d38d8dabc306dc5b42cd668c3ac82e833", - "sha256:020e881a764b20d8d7ca1a54fc01b8175519d108e3c3f194fddc200bda95951a", - "sha256:04c721c2c7448767e9e3f2520a475663d8ee0f09c31890f6d2bd70fd636a9647", - "sha256:05f340e47e7e47d2da8db9b53e1bb1d294369e9ef45a747441309f6650b8351d", - "sha256:0a70e3cf2804a300d921bb0940426e35f4e489a23adfb77a808892241db0a064", - "sha256:0adcf06ffde0777c0e1a9b771a2b1c4226ba1bbf748c8efcc02fcdeca3299107", - "sha256:0c0d9802354507bcba62af19c17918e3eb437cc25e6f50657d511b5856a77aac", - "sha256:0e2bf9280bceb5efca998435904b5d3e9fdbcc11d90dc9df30aec7973252b720", - "sha256:1233ee2dd0cefba127583de50ea654677277047d238303521db35def3d7b2e7c", - "sha256:146ee4e9ce80b365c6d4c47073da9da7bcec473e58194ceee5dd7620ace77e06", - "sha256:1548006a91aa93c5da81f3bdcebc1a0d10cea2d25969754fbe848da622b2b895", - "sha256:196300e7e5d6e74d50f1607ab9c06c4a1484c383cd22defd727902591f7e8dde", - "sha256:1dabedcd0f23559f3596428c6589c1cd8c6eaed3a0d720795b07b0225d769203", - "sha256:20466cca18c49c7292a8984bc15d65857b171e7264bdcb5f96baf8be238791fc", - "sha256:298872ecf9e61950f1c6af4ca969b859ee91783bb920ef6e6172697d0c8aad74", - "sha256:29a3f6e9667868429d8240dfd063ea5ffdc1321c13d783aa23827a38de0dcb22", - "sha256:2eda0b7ebb1283a98d3e4492ac933c8af6aff59fd3df1c3ed024f536af4b1dc8", - "sha256:2ef59c659f289eddf8aa6623823f19fa2f40a4029266889eac7a2505dd210c35", - "sha256:2ff164c1b0bcb740b073b99e945234d0212852fa378e44a208c425379140dbeb", - "sha256:33f14fba63278b714efe6ad07e50ea5f03d91537aa6a1c5f1ceca4cf44013ca9", - "sha256:350cb813d0af6e65d2f7ef0d729f7ff5be5a8bce03665892f43e5883d4ecc1b8", - "sha256:4202c74688ca06591f78cb18988228bd4cca2cc75d57b60008372892d2f1e6e6", - "sha256:4227224aaec8f7fbcbfbd4272319347b2bb4030366502600f8c45588c5187b07", - "sha256:491cc39455ca765fad51fb451bf2915eb2cf41192ab5801ce8d67c1d614fe056", - "sha256:575957e79cd51903a4e8495a242442949641e08f1efd5197b43bebd3ea7682b4", - "sha256:5ad5467fc3f68b5468e06c5f788d712e9f8ffc8b0cd1bcb160c105c1ee92dae7", - "sha256:5bb9c386f0a329c035ddbab4b72d1028bf9627add8dda41070288563d57ed1b1", - "sha256:5c24aa15d5963051e1a5c62b12c50cd705992502b5ec1f3bece6046f33c9fc24", - "sha256:5f6277e5f783c36786a145e0247fc189a03f35f84b251646e53592d2bc12b355", - "sha256:60926b75d00c8e816ef98f3034f484a8bc64242d66839cef4cf7e503142316a0", - "sha256:633727297ed063441fd1cda2288865487f33ad14eeb8831afb5f0c396a62cfce", - "sha256:67f6dd22fa72a93752643f07889796d62739a13415ee630169a8ce764f86cf9f", - "sha256:6d09badf350af2be9d189184e04e64cf54ad93569ab3d96fca58bd3e84aad707", - "sha256:6ee967f7c7e1df2890c671ff2ee51a28ded0efc95da3e507176dee881ce36c66", - "sha256:74847557e28ce71bd3c438a447ca90e4b507e997ddbdef8a12a7b283b86c156b", - "sha256:779197a6513bab3c3632265e3d0f7cb3227e62510841a6f34f1eaa37efbb345e", - "sha256:787c9bebb5833e8f6fc8abca3c0597683d8d87f56a8842b6b89c75a5f3176e2d", - "sha256:7d31c0ac0c640f877804c67cb2bc9f4e23dc2db97e96c2e67fa27d38283b41f8", - "sha256:810b916696c86ef0deb3b74588480224df4c1b071136c34183e4a2a4284d7ac7", - "sha256:83efa1c898e0fc5380fc0cabbf75164c52e3b5cbb45973710d75821928380c73", - "sha256:85f57e960d877f2977f6430896191b04a21f8901b3b4baf2e4604329f4db5402", - "sha256:8b267ce94efb76fbd1b3373511420074ee3187f0f7811bf394531de13294735a", - "sha256:8c2ed1e48cc0f460bf3c7780e7137ff21a4e18433451916f2442c1b21036cd7d", - "sha256:8c7b398c56ff125feae96c2737abfec5595f1fa0aa186df60c56040b8accb95c", - "sha256:8d00f177ca88a77c1cf848d204a38f249751650b601cb6532acc68805d8a8273", - "sha256:8ff92d7feeaf5bc26c51495b69e2f99ed97ab79346fb6555f44be7dd2ac6503b", - "sha256:91054a783328e0ea7954b8771095705c8d2243b814743fbaadf14552c9c52c5d", - "sha256:98b58bdb89c46190e4609bb36abe17c6d4105ad13f9c5f8f6f64d320f8ced3fb", - "sha256:a28d076ca7c82b9c8728ad90b7147489449557038bed50e4241eb832395169b4", - "sha256:aa6c4be5d1c02a42b066ca6ddb71adf36432868fdcdb6ee87e634e86e0674190", - "sha256:aded5bdf32609dc7987a49bbbd15a8ef096193f96dd8bbeb791de729e650acf5", - "sha256:afc5febcd4c99effbc02b528e49d6fd0760b2b7d48c05239e345a5fa6e743d9a", - "sha256:b50b727bd652bdc37d950336c848ef20ec54a4cafc38dce19b1cd86ad625d0f7", - "sha256:c1c79a604a2969a868a78b6ebd27a887e00c624f14f66b3038e0590cb23332d1", - "sha256:ca0dacff965c47afdc3749a8469d7302a8f801d6a28758d55120d75e66ce6889", - "sha256:d3567748a5107cb40cdf66a275430c2f87c07777698f4bfd25c35f44d533258c", - "sha256:dc871b997a9370d855b7394465f2f350e847a5b806dd38dcc9c989e7d87da155", - "sha256:dd3bfe82d53edfe4b7fc9a7ec9761e23a7a5b1dac22264505af428253c29ed24", - "sha256:e3dc2feb0876209d9c38aa56cb1de169bd6c4348f1aa48271f241226590993e6", - "sha256:e4f1d0f8f98ade9634e01fb704a408f9336c0a8f1117b369f5db83dc7551d8b1", - "sha256:ec0e675d59150a6269ddc9139087c722292664a37d071a849c05c473350f1f2d", - "sha256:ee1d9ed27d0497b848923746cf762ed2e7db24f4be7eec8e5cbe8c766aa707b7", - "sha256:f02cf17a6ca1abe29b5f980644f7551f94d71f2011509b26d8625ce038f0df64", - "sha256:f12038a35fabd52e56a3547bab42401af49a45caa6dd00b34c44de235bc93ee2", - "sha256:f310233ef7fb9c14e201c93639fe5f5260b005f56f0b29048e999c30935596cc", - "sha256:f9389552ecf4784886345ead0647e4edc96bee37cbab05b75540f542f766c48c" + "sha256:07c9733089d1b176c3dd2f7fa268452f9d5d784d076473499d754a58e8d1fbbb", + "sha256:0955b9000725573d1457c1676944b370dd9643c8d18f25bda5ac72913f850949", + "sha256:0c91762c48cd686dc9cf2b142c0bc544083952de32f5853d6624c956e54b85e5", + "sha256:0ed5823c4efc20fe87d3530665f40ec18a002be003114814c21235cc8d256207", + "sha256:13221a6c81ebb8e43ea63a7251c35d54e4175cea37ebf3a62e911bdf42562a3c", + "sha256:186e6c602b8a9968b8e864c67d622a69279f7d1e55ae25f40e3bff7e815b2b62", + "sha256:18a6ed513023001b28dcd3ba54966f6bb90a38274ba8d2640464bcab3a1b81d4", + "sha256:1d6bcec3dbbdb89ca385d3a73e63ceae7b841fa0d7ca7c676f1a7bfe7fb2cdb8", + "sha256:1f4ae8bd4ad9ba085fde95e95d055a896d19210238a4199a771a3cf36dceed49", + "sha256:1f585407f740a9eac04a3bb82c61d68a0ea78f90e29e670bfb086b9ce3a518dd", + "sha256:21bfa4d2aa0b04c1806ef778a1199e9e53ea2441bcbf284420a32083896320b8", + "sha256:2487453ca1b6104442c6442f9a1a8fee1fe8f428a70d99d4cba799108b304150", + "sha256:2574ef81c1c8c38b10e330f3f9406fd09198a776b002030fafcf8e7647e9e06e", + "sha256:30e1522e4173230dca4d9ad896f038f73c0da6c1edd42f4dbad88ac583cf5d46", + "sha256:32edb81a2b5eb7cd7c9d941b2bfbbb082fd2cd09e0e725930316af6b708db186", + "sha256:3372475211a9ce1a23acefe512cb3e121d18c95dc74ed56cb1819ef40836ebf4", + "sha256:382b219de3d436de3baba0f4b0c6d4336e8f5858d0eb047918b13b69a71c6c55", + "sha256:382bc88fe90f29f5ac8a0b65c7046ff255356f2f2f3186c30e370215736fa1dc", + "sha256:39b6986c19e1f2dfa549d185dba6ccf1de2e4c0ba10d8cfc0048935b1c5f9109", + "sha256:3a31905206722103a84c1f72633fe30692cff6732c9d262e09a27dbc468797c8", + "sha256:3d4c807ed050fe3ddbea5ba7e9f63d7136871ce42861be1f50ff739f0e91047a", + "sha256:3ec409b0d6aa8e9eec6eaf881b893caa215dbe68c5319ca96e8a271d81bb111d", + "sha256:471e12a6a42498a31490c206e0069e343b6a7c35db540be73a879eb06f5be047", + "sha256:4c0780095871ecc49a58b2ff6b1b43b25214704da67646557ca287a3f49fb2dd", + "sha256:59612b4ed48a04cf024584218e813562f3b30a3bafa5f55abe300b15da314751", + "sha256:5bd5f91ea75c45cafcc5433ba8fae59b708b736ec178d2441c40c499e9e079db", + "sha256:5bf390259cb25a6a1cd197c65810999b811f64cd38683251538bcc5a1e41f7d3", + "sha256:5c1efdd9181cb1b719ee46865f368a927f1c0c65d577798340b1194545b7515a", + "sha256:5e0d7950ca3c1bbae291d0552dd3bb2792fc680629c4c0d44e47e5bab969f3ca", + "sha256:5f304123b90e8b2e49867981b7f6061612c39f50cca51ee88de007c084cf68d3", + "sha256:62cc1a4ef0e553bac32c8342e1f04834aca7de276b92744eb7307db77759b890", + "sha256:63bb7448a1e9111319ae2430c09a5596140c160422830d6271bc75730ff2ff9a", + "sha256:6576f348ed6cc4f31db6fd915a8e94245f042f50eae08d48732425e70638ea37", + "sha256:666ef5601ab0e6e345e47febc96aa81143cc932201543480cbb9499164f05ffb", + "sha256:6707d2fa2aa1bb5424ea0b05f44ffc989b15ab41a73ff5855bff4944fec7c8ac", + "sha256:69ad12cedb674c73527bed869cddb42b742cac79a207a614202a4abaa24ea173", + "sha256:6a834097144aabe948b8ca9020a833e8026f7d0abbd0ec54bc7e50f45a8ce012", + "sha256:6df430419f2338cb71e4a34d6e64f83c88ccd321f91f40ba4513400b36d864ec", + "sha256:700bc0fc9e968a292b9137ee70e7a012f7e115bf0107ce45e3a88202788dfc1e", + "sha256:7013534a7163aa4f213c4d9864f1a8a7555daac6fcd48f699a198e29b436bfab", + "sha256:7995a7c6a62a1d6e7df211b4a16de513bd99fd053525050a319f80f44fb8015e", + "sha256:79dfa38faf92f804aa61beec140d70b18418e1dde1778dbb77a87a4cce85aa8a", + "sha256:7a003b02c6ee2eea6dfe0bb08818631e3597e69f0131f2a8250488a1cc553290", + "sha256:7c047250096f9fc19dba26e3d1639b5e7a84114003605c94def667149a70ced1", + "sha256:84a6616d396ec1bc18a1e83e67c96a393ec35dfe5e17434a5be7b9aa0fe988ab", + "sha256:87cf2ef05ff2f2493ba29fcdaef27e960ca64dacfd13460ae29e6f92e0ed05bb", + "sha256:89c930aece4e972b208ba589c8410b4167b05e411a5ea2cb25fd96f8bc47ee43", + "sha256:8ca67f77938ea6a3663aa9bd22b3e031f6da84d665be850abab910ee90728dfd", + "sha256:8e51eca14fbb65c4e0a5a9657346962bd3dca78c08e04e3d4dee70ef48687d30", + "sha256:8ec7a1d49ca6c2569d722ab5ec86e90089b0713900aa31905b47b4c4d9e78ce0", + "sha256:902f3490db0e07a7d40b48536a85c9b28fbf1397e7e1658a45a55f958e303620", + "sha256:905a189853d6bdb204c7ae5f4ab77fb857448abfff574d3d93c62e2815b24b4f", + "sha256:9276ba88891338f2617044429dfd080ae008c9868a25f6f1a7d004a35dc9ac0a", + "sha256:9324c54995641c3d1f92a9d55093c8cde0ffa2fbc87a467a688ef60428393220", + "sha256:968583e956d0427878050b371308c5f8647088732ef3e66a117dbe1192ec91e0", + "sha256:9d7e9cbb0998bbfd363fd9a09c330520d5e9cb323c05b5a1a05865d23ccf2226", + "sha256:a393e428f6ffb0dcb73308c1fff5593041c16ff42da66e5bac8a83a6107a54b0", + "sha256:a6b63917d60d6df451f328bd6afba8565e33c4afe1f62ec4ad758b78731c827b", + "sha256:b1631e12fe572e181cd77e831f69335d6cd5278eac22e3db3f33cf264ac2ac18", + "sha256:b774ff994d844e541439ac5d2d49a14def4104830c3465e9394c153f86200ffb", + "sha256:b949cc25e4a09252cbcc54e66e507de914d0e94a3a7039bd54c299bf7037c098", + "sha256:bb89b5dc30469c84bbf8684826eb851d82412ca95690e111b9ac5e8fb343961a", + "sha256:bfe7d5b62cbe7aa664f0b3e2c49077f10fcdd06183d3014f8271ff3c5edbfbf9", + "sha256:c309a7abae1d14ba29a8bd0ddbd704a5e469d8e9bd9c3dee0e4ff53d7ae01d56", + "sha256:c77e27790ad72989db783d5303825fba0b71550f00a490efba35cde7dc4b719f", + "sha256:c942c21a93f36b3a69e828c8945bb72c94dc2ffe488a2086950c812f3edf046c", + "sha256:ccea05b5542f6d283fef3f0a8e93a7f0be90af0ddeeef84c25c0216ba76dcae1", + "sha256:cd5a9f9f86a52c24713679aa2631956835f3842512964ff93f736ff76f1f530d", + "sha256:d0238cd05dec9ffbe0de1071df685ba63e30a36ac155285b1a094e727c38cbe9", + "sha256:d1c1e8989a855b7f1f2a64ec4a80b23a631822903952770813857b2e4f460471", + "sha256:d2f9c4f85e47a44d26d5baf3b041eef23436e224d44eed273f01bd8a12048d9f", + "sha256:d31864ba3933a589b6a00249f89c0eb422197f49128fc10da550e57e9cb0f377", + "sha256:d8ef3a66e4b52d2d7fdd90df2984670124b2ff7546d76bb25dcf68ef47f7df58", + "sha256:db84203b13aecc222f465061397fdd5b53b7ae73d2c95ffc1c8dc5be0153a709", + "sha256:db9fb67a3a2e75247bae569d34ebb5ff61c0448a4f0d6dbf991dae68af39b007", + "sha256:e0bd394e999949c814f7912284243298de1b5a17b6a3dcb6cc8a79b156ffc4fa", + "sha256:e15f70588f4db8cd10df0930145b186de70feb9db51710cd378b1399009655bd", + "sha256:e54394b7dbe2e12ab032d9d21feef7bb61a90a150a2623633ba3781ba69dcb1f", + "sha256:eaf7e82249837e3aa97297b34a0bb9ff562027381631e057cea6e1367f10b438", + "sha256:ec0030361cc861ac699b2ef1c695b741fa145c88f8667fa3d7e3f73deeb648a3", + "sha256:ec90a9ae3e1169fa1171147340f0e97d941aa19fcd3b34e8339a55933ed042af", + "sha256:ed899d73a22f286a72bd9528d63f2ab3030dbad8bf1527fc249319a50d61fb9d", + "sha256:ede33b2892ceb976283e009ad12fa1834cfdf1f9c43ee9c97849fc588d00a618", + "sha256:f24a43b3560e20f825b807fe1e874bd73d53abaf8bbdcf258a6eb152cddbc1f5", + "sha256:f3d7b3d0018746b5997dd6b14a1870b07cc4c327d9101145d94a1fc264a51a06", + "sha256:f41ca154b7737b11893cdce3c78c61d703398a1cd54d4297bdad908392338a8e", + "sha256:f42f146752eedb6765f07dcc04d72dab0a25779ec8d4a88c0085263ce114f22c", + "sha256:f56fba61b2516be7917cb00151f0d060b5b21184e3499bb57f0f7d9259bea124", + "sha256:f9ddd28d3e9bbc602a9dced1591882c7fb9ab776eef8837da2c326fde19e2853", + "sha256:fafc3b8898b432b841d30a61082c599fa7f4d06885f9dc58ad72259e12059fa6", + "sha256:fcc6800daac4922960f6eeb7a0dda3dd4105e0bf7bce0e83ebc465a78cb7bdba" ], "index": "pypi", "markers": "python_version >= '3.10'", - "version": "==1.2.1" + "version": "==1.2.3" }, "packaging": { "hashes": [ @@ -824,12 +894,12 @@ }, "pyasn1": { "hashes": [ - "sha256:9c447d8431c947fe4c8febc4ed9e760bc29011a5b01e5c74b67025bd9fb8ce81", - "sha256:deda9277cfd454080ec40b207fb6df82206a3a2688735233cdcd8d3d565f088b" + "sha256:4017b0fce125096b8573b39c989fdb1a4b19cf761e683398184550fea0e66587", + "sha256:6b11616a6bcf3a40e635f082bb232fa57b5e0dd7f517bd7ddd69ec3794508a47" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==0.6.4" + "version": "==0.6.5" }, "pycparser": { "hashes": [ @@ -1038,20 +1108,53 @@ }, "tornado": { "hashes": [ - "sha256:11881db6b7c168494be2c2d12e65931451bdf7ee718535418ae1d8855dd5a0ee", - "sha256:547d63f450d570c14fe0e8db2cfb14c9bbd1c2503b4a6612586267955aa47b58", - "sha256:5d242290bdf7ab3151bc1065fdd75c0dcc21cbc7b49f22a4c56329c2d6566d22", - "sha256:67832909c4779c64942380cb5f044a5c6163d00831472d80e25e115de9917836", - "sha256:68a7468c7e289f8514d7d664101753903217eff1bb6822c6b5994a0b5f5bcb26", - "sha256:7b94ff0e128fe0542f3bd331fb44d06260fc4ac16881545159f34ef08aad4195", - "sha256:7e2360a0ffbe145eca8af0b19cb7203d79b1a98dd4cccdd6b368f6f49c2e3808", - "sha256:9452e1b208a8bd771e2cb1f2ff564985b9b214bdebbe622793e1799e0a6bd23f", - "sha256:9715b5eb79735b2bcd454ce216a9275b7c0470e64ea1bf5742f78b2f72b26eeb", - "sha256:cc6aa787d7cfab7c3d35189dc7a56fbd2399a569624c730c6b55b3d6531d0403" + "sha256:01dc73e3697eb94d78c42e03931ab621da97d12fdfb6339e64ff5a934b220fcf", + "sha256:0223e827cedf4e35ebb035e57a0d9974563cd043e3a53f8bb72a859b6f53777e", + "sha256:065bc741478b168df9baf754956a3010c04d1330bb45a84833d807c29e11b257", + "sha256:08b808e8d3312c268f9fe1ffebfcfaaf342e7fe4ac40d219a7e1b58bac547d6f", + "sha256:0f0f596a0dab6826aa21d103c7bc242e3fb7cfc99c5c3d44a35ba8c83abbdca4", + "sha256:15443805d6b7aa11610cc6c5be7e71b4a93369aeb2ca5a13c2def53a3af5ba45", + "sha256:1b6ff57cc69b339f8feb9e7b567b0e0eacb16bfaf234159496623ef7a67ba640", + "sha256:25b2619274bca77d0eb7b4d96dcf2d1142bb9bf172ad6a7491a1e1f82e6e48fa", + "sha256:28e6311402af59c8b02e3fa0f5e7d8eb465b25081381803b127d97e6a4395d5a", + "sha256:29bce3190c2973fcd2171c95eeab8bf06d2f7a7eb107455ce3e4662c704aecdb", + "sha256:2fbfd2510b6163b189773155a8246c025cb260ccc7cd12ad18c36c54f5617bb9", + "sha256:3298fce72c35f836eab4c4db8b960104ff1ea718033a6b5e236f04efe3a1b6e1", + "sha256:3c35091add5863feb9cf651851bb1b23592f1f9551b5dfed72837c83ea4e5b85", + "sha256:4bc6c60faf86162df25ba2ff5611d27b6ef8226de9d61c07a0fab53c169630a5", + "sha256:510c7261ed986ecd6f74edc1a13412759e7abc2e8be3a6c85e15f6c53e1f3c84", + "sha256:533185c89be3ffb01656c9425da4ff42587a3af784b37d39fe762e8fce3b2dbe", + "sha256:54c80f9bed0bf1533ecf5a90dc59651645622d62b0bcffa2692d108a1f794917", + "sha256:58d2f47e7b54fded3407dbbbe4e59d29ca627f85bf6c0f21f0b151c6c7fc9c53", + "sha256:5cb82ca38596e1350fceaf994f287847f82f7b8436380d36ba0937a03107d0ee", + "sha256:60aad449dbcebaa8d69bff50c6ba39858fab8d256e779a99bb30ebf6724b9b48", + "sha256:6596f3e939962f13099ce8d1a96b83226e908ca369b193370a6efa84585a1601", + "sha256:71c16b382b22d3234913a3f74a1ea84bede197d11eb03871df17bb123088dfa5", + "sha256:77dd6e0c659fdc45824e0746988ac5c060c2a9fee9b8cbbcdb999b3f29d3cd10", + "sha256:872249311539281c1e8a5d8d6f27f478bf705a9bd931bf374b6b31b05177dfda", + "sha256:8cae3d8f2585be01670da9fd5010c61724c51b61ecd4c06820e95874739daf7c", + "sha256:8cd28b2cacbe63d53e28a38546a3492b488417eeb3f7ecf10954476fc2508882", + "sha256:8d475f4053c693b5c1483eb4845824129b0b51c65712e736b3c2ea1c8f6080cd", + "sha256:95bd4751357bef52aa655e236b9667ff054885de4b118e4ce9ba5c06e12ef5d0", + "sha256:a72f70b1aa630fa2106d39a025e2be75c272b7ec8233da94e2f407ea754cc32d", + "sha256:a8d3e6acde5a80d13b13b5e4c7c226ca682f31d0a62b6c33cea038714bc2de1b", + "sha256:b62fded687e55acaf9e36c1230b006066a35b3f6df093ba1fd3b2ff592070e1d", + "sha256:b777fbe0bdb2c4dc764aadf5f70e9b23b2e536c339d61c799d3ea1b575a7c285", + "sha256:b77ab23d1520c807d11e703e79b020d3bc3676a0f5ebc8531f46d3fac8aecb2f", + "sha256:b9ce0d6548bd73b1329075b247d3fdc61538922f558ee42059e08f5df53fc197", + "sha256:ca95e762df1ca761f330e3f2a034c15ac144569844b52527a5a9eca9f524c0f1", + "sha256:ce5a18654f5d56d11400ab5d87103660e14deceab41818a06a42acc8dbbe427d", + "sha256:d83bac141bd9360d8e995ec512097be19ead2e9213c3e7088510a036f3192b8d", + "sha256:da6ce2da215810d56539fa6cac77d9e27f4d8139c6868c53436b2fe933f43c79", + "sha256:e923e75c9d641cdb8bbac60070a2dccdb684fc555af2bff48b0eaded0f88c2dc", + "sha256:eb67ba2cbf598e842f14684eab029a5a4ba7ab587e8c4e40940a77ed0596b31e", + "sha256:ecef88054d8a77878f61061ff67dfc5e1c17d1f7334890ab508b310e8e68ee46", + "sha256:ed0bc5a1a9f6346e7bdadc106fa2d4c6e79d71d8b2df4366260ab3baf36a8399", + "sha256:fbaa022a49a27b65668592cf43b898ff3978cbe4e6926fdfe24dbef59053bd26" ], "index": "pypi", - "markers": "python_version >= '3.9'", - "version": "==6.5.8" + "markers": "python_version >= '3.11'", + "version": "==6.6.1" }, "typing-extensions": { "hashes": [ @@ -1064,11 +1167,12 @@ }, "urwid": { "hashes": [ - "sha256:58ddc5c65eb3109b69e2e95469553f9f86070645cc1b553d6ee3fe8dbac2e0ba", - "sha256:f6f0381d5656b8b24ee960969927021d858c1f7320771cf8f3ec5b94a139b9b7" + "sha256:b85618b42f48ce3028405002743238c511185439cb356c3c68190c44cde4778a", + "sha256:c31aff787741428028b20bac3b0774fbe4f10de00ae00fe07722244d09462248" ], + "index": "pypi", "markers": "python_full_version >= '3.9.0'", - "version": "==4.0.0" + "version": "==4.0.7" }, "wcwidth": { "hashes": [ @@ -1099,12 +1203,12 @@ }, "werkzeug": { "hashes": [ - "sha256:210c6bede5a420a913956b4791a7f4d6843a43b6fcee4dfa08a65e93007d0d25", - "sha256:7ddf3357bb9564e407607f988f683d72038551200c704012bb9a4c523d42f131" + "sha256:55ca7c70a75689be937aa27f8ff4b018f06ff4838fc73045560bf0f5a1291060", + "sha256:6392e50c78460ba618e5b21f08a71f59c99ce99cdc6cf6e3dd7e6ccca8754fab" ], "index": "pypi", "markers": "python_version >= '3.9'", - "version": "==3.1.6" + "version": "==3.1.9" }, "wsproto": { "hashes": [ @@ -1232,37 +1336,37 @@ }, "black": { "hashes": [ - "sha256:0126ae5b7c09957da2bdbd91a9ba1207453feada9e9fe51992848658c6c8e01c", - "sha256:0f76ff19ec5297dd8e66eb64deda23631e642c9393ab592826fd4bdc97a4bce7", - "sha256:28ef38aee69e4b12fda8dba75e21f9b4f979b490c8ac0baa7cb505369ac9e1ff", - "sha256:2bd5aa94fc267d38bb21a70d7410a89f1a1d318841855f698746f8e7f51acd1b", - "sha256:2c50f5063a9641c7eed7795014ba37b0f5fa227f3d408b968936e24bc0566b07", - "sha256:2d6bfaf7fd0993b420bed691f20f9492d53ce9a2bcccea4b797d34e947318a78", - "sha256:41cd2012d35b47d589cb8a16faf8a32ef7a336f56356babd9fcf70939ad1897f", - "sha256:474c27574d6d7037c1bc875a81d9be0a9a4f9ee95e62800dab3cfaadbf75acd5", - "sha256:5602bdb96d52d2d0672f24f6ffe5218795736dd34807fd0fd55ccd6bf206168b", - "sha256:5e9d0d86df21f2e1677cc4bd090cd0e446278bcbbe49bf3659c308c3e402843e", - "sha256:5ed0ca58586c8d9a487352a96b15272b7fa55d139fc8496b519e78023a8dab0a", - "sha256:6c54a4a82e291a1fee5137371ab488866b7c86a3305af4026bdd4dc78642e1ac", - "sha256:6e131579c243c98f35bce64a7e08e87fb2d610544754675d4a0e73a070a5aa3a", - "sha256:855822d90f884905362f602880ed8b5df1b7e3ee7d0db2502d4388a954cc8c54", - "sha256:86a8b5035fce64f5dcd1b794cf8ec4d31fe458cf6ce3986a30deb434df82a1d2", - "sha256:8a33d657f3276328ce00e4d37fe70361e1ec7614da5d7b6e78de5426cb56332f", - "sha256:92c0ec1f2cc149551a2b7b47efc32c866406b6891b0ee4625e95967c8f4acfb1", - "sha256:9a5e9f45e5d5e1c5b5c29b3bd4265dcc90e8b92cf4534520896ed77f791f4da5", - "sha256:afc622538b430aa4c8c853f7f63bc582b3b8030fd8c80b70fb5fa5b834e575c2", - "sha256:b07fc0dab849d24a80a29cfab8d8a19187d1c4685d8a5e6385a5ce323c1f015f", - "sha256:b5e6f89631eb88a7302d416594a32faeee9fb8fb848290da9d0a5f2903519fc1", - "sha256:bf9bf162ed91a26f1adba8efda0b573bc6924ec1408a52cc6f82cb73ec2b142c", - "sha256:c7e72339f841b5a237ff14f7d3880ddd0fc7f98a1199e8c4327f9a4f478c1839", - "sha256:ddb113db38838eb9f043623ba274cfaf7d51d5b0c22ecb30afe58b1bb8322983", - "sha256:dfdd51fc3e64ea4f35873d1b3fb25326773d55d2329ff8449139ebaad7357efb", - "sha256:f1cd08e99d2f9317292a311dfe578fd2a24b15dbce97792f9c4d752275c1fa56", - "sha256:f89f2ab047c76a9c03f78d0d66ca519e389519902fa27e7a91117ef7611c0568" + "sha256:03c0ddd93bb392e71209903a691767eb366fe1a76deb9509ccbaae9e1f14bb52", + "sha256:0ce08b367307b0fd91c9dd1d4084e62b05b3055475f951f0f34a46b6e2393b64", + "sha256:182f6c32be38074b16d378498c498b32cb51928178ee611485344972c35ec9c6", + "sha256:1935b32f5326028019856e18cb42b4da63db23765dc84464cec723e0de478a9b", + "sha256:19fa8f5beb5e77c54c9c7e21d00cc93ed6c8b6228ee385616906d6befe081143", + "sha256:2520037aa62f8a1454d0811b8f5c88b444445b03a4bfba480d8d220893b64c34", + "sha256:28842f9a8207cc1df6eb983a35a14c5a0dfcd603d214fe82d84bef552afd2e3a", + "sha256:289282aa2e09d3162312a3be1788ff21b08e9ea9cc4a81e656024728b32428fb", + "sha256:2ffbc023a12d0c729408823b8f10514490bd0baa301d0d4e21a7240249f9507f", + "sha256:3414a0c52901964dceabd98c7c56beac0f964115a116ecedcce7247359b14017", + "sha256:4d9a90516db1d99c25dbb20cc0998e0e01531dd903466c7744e56d66f864220a", + "sha256:51d5e417e700fe6ec0b0ecdc408c6f6cb5def80328f31f724993d82c6486b746", + "sha256:5cd88fd7b444ca51f3fc883b6f6657ea53a258b0b2eef6d9f2dfcfa17ce0e27b", + "sha256:5f9f83beae62437e060dafd53d7f1fc327e3d3494f74d72ee5c2b73eb90fc4e7", + "sha256:70ccbd175b7f6be29d2b727ee7ca6b4c54053df59da653a6df80b175d20a94fa", + "sha256:7bdade400bfe24d78a7762896acc2f9a8e1a17fb0fd0536bf6b7c7097cf3eec7", + "sha256:8375962579d537364cc0efa19b1474481915d3a793f9fc0774901814c5e5b5f4", + "sha256:978113a40223a6aaefc17364176a809a320e6b288683841427fff04c6d7b4130", + "sha256:9a0219b29cd70e49f920acb7081e6ce5025c719008447c521d0200dcad93206a", + "sha256:b5347d760f0c02bb00dd249384cab71c3bf828b4f68d5b401eb116e0390f147d", + "sha256:b6272cfd7e1e8e271f5b0e0207259fe2834687e5cb9b5f620b34a44db9754993", + "sha256:d42dd2fac7c342ae67e64ee99c9532e20b2a84e92c79ed3317fa2ef54c801d93", + "sha256:d5bd3518d8e97138fef295230b1e9804076d69fa4e3594071494a8c68abe6266", + "sha256:d8b3a9074a680b3c5749633714e9ae3992a1e5a23343a97ad61cd9b119b444d2", + "sha256:f6dba8138cdc99061ef07b958ac082d2aa057b6961d1936f9717c350f02bab5f", + "sha256:fe85fc4019bee59bc495c0f2a8ee76c5cd02c7015508d94a967ba2376f39a52c", + "sha256:ff57f63029aa1353fa8b1b0c8971fd88a6c92dc766608d2eee33ad2deb23270e" ], "index": "pypi", "markers": "python_version >= '3.10'", - "version": "==26.3.1" + "version": "==26.10.1" }, "click": { "hashes": [ diff --git a/src/test/regress/expected/arbitrary_configs_recurring_outer_join.out b/src/test/regress/expected/arbitrary_configs_recurring_outer_join.out index 4df6ea69808..c7fcb1d2dae 100644 --- a/src/test/regress/expected/arbitrary_configs_recurring_outer_join.out +++ b/src/test/regress/expected/arbitrary_configs_recurring_outer_join.out @@ -92,6 +92,69 @@ USING (id); 101 (1 row) +-- Dropped-column placeholders must not shift aliases or collide with live names. +SELECT COUNT(*) FROM +local t1 +LEFT JOIN +( + SELECT * FROM + (SELECT * FROM reference t2 JOIN distributed t3 USING (id)) p + JOIN + (SELECT * FROM reference t4 LEFT JOIN distributed t5(id, "dummy-1", "dummy-5") USING (id)) q + USING(id) +) t6 +USING (id); + count +--------------------------------------------------------------------- + 101 +(1 row) + +-- Remap multiple replacements, including whole-row and correlated references. +-- Return a boolean: non-MX workers do not have the table's composite type. +SELECT COUNT(*) FROM +local t1 +LEFT JOIN +( + SELECT * FROM + (SELECT * FROM reference t2 JOIN distributed t3 USING (id)) p + JOIN + (SELECT t4.*, (t5 IS NULL) AS nullable_row_is_null, (SELECT t7.id) AS correlated_id + FROM reference t4 + LEFT JOIN distributed t5 USING (id) + LEFT JOIN distributed t7 USING (id)) q + USING(id) +) t6 +USING (id); + count +--------------------------------------------------------------------- + 101 +(1 row) + +-- Without dropped columns, system-column and whole-row Vars must be remapped too. +SELECT COUNT(*) FROM +local t1 +LEFT JOIN +( + SELECT * FROM + (SELECT * FROM reference t2 JOIN distributed t3 USING (id)) p + JOIN + (SELECT t4.*, (t5.ctid IS NULL) AS no_tid + FROM reference t4 + LEFT JOIN distributed_dense t5 USING (id)) q + USING(id) +) t6 +USING (id); + count +--------------------------------------------------------------------- + 101 +(1 row) + +SELECT COUNT(*) FROM local LEFT JOIN dense_row_view USING (id); + count +--------------------------------------------------------------------- + 101 +(1 row) + BEGIN; WITH cte AS ( DELETE FROM distributed diff --git a/src/test/regress/expected/citus_depended_object.out b/src/test/regress/expected/citus_depended_object.out index 08cb6263c2a..7c8f6d13e48 100644 --- a/src/test/regress/expected/citus_depended_object.out +++ b/src/test/regress/expected/citus_depended_object.out @@ -178,6 +178,18 @@ FROM (VALUES ('master_add_node'), ('format'), citus_independed_proc | f (4 rows) +-- citus objects stay hidden when the meta table is on the nullable side of an +-- outer join, and the outer row is null-extended instead of being removed +SET citus.hide_citus_dependent_objects TO true; +SELECT n.nspname, count(c.oid) FROM pg_namespace n +LEFT JOIN pg_class c ON c.relnamespace = n.oid AND c.relname = 'pg_dist_shard' +WHERE n.nspname = 'pg_catalog' GROUP BY n.nspname; + nspname | count +--------------------------------------------------------------------- + pg_catalog | 0 +(1 row) + +RESET citus.hide_citus_dependent_objects; -- drop the namespace with all its objects DROP SCHEMA citus_dependend_object CASCADE; NOTICE: drop cascades to 15 other objects diff --git a/src/test/regress/expected/function_propagation.out b/src/test/regress/expected/function_propagation.out index 4f1df24f0e7..8831e7df8cb 100644 --- a/src/test/regress/expected/function_propagation.out +++ b/src/test/regress/expected/function_propagation.out @@ -1214,7 +1214,7 @@ SELECT distribution_argument_index, colocationid, force_delegation FROM pg_catal (1 row) -- Show that causing circular dependency via functions and default values are not allowed -CREATE TABLE table_1_for_circ_dep(id int); +CREATE TABLE table_1_for_circ_dep(id int, col_2 int); select create_distributed_table('table_1_for_circ_dep','id'); create_distributed_table --------------------------------------------------------------------- @@ -1244,8 +1244,11 @@ BEGIN return 1; END; $$; --- It should error out due to circular dependency -ALTER TABLE table_1_for_circ_dep ADD COLUMN col_2 int default func_2_for_circ_dep(NULL::table_2_for_circ_dep); +-- It should error out due to circular dependency. Set the default on an existing +-- column: PostgreSQL 17.12/18.7/19rc2 reject ADD COLUMN here before Citus can +-- detect the cycle, because table_2_for_circ_dep's default uses this row type +-- (CVE-2026-6460). +ALTER TABLE table_1_for_circ_dep ALTER COLUMN col_2 SET DEFAULT func_2_for_circ_dep(NULL::table_2_for_circ_dep); ERROR: Citus can not handle circular dependencies between distributed objects DETAIL: "table table_1_for_circ_dep" circularly depends itself, resolve circular dependency first -- Show that causing circular dependency via functions and constraints are not allowed diff --git a/src/test/regress/expected/isolation_citus_schema_distribute_undistribute.out b/src/test/regress/expected/isolation_citus_schema_distribute_undistribute.out index 88737f2625b..f9b65625308 100644 --- a/src/test/regress/expected/isolation_citus_schema_distribute_undistribute.out +++ b/src/test/regress/expected/isolation_citus_schema_distribute_undistribute.out @@ -84,7 +84,7 @@ citus_remove_node (1 row) -starting permutation: s1-begin s1-schema-distribute s2-rename-schema s1-commit s1-verify-distributed-schema +starting permutation: s1-begin s1-schema-distribute s1-lock-schema-row s2-rename-schema s1-commit s1-verify-distributed-schema citus_add_local_table_to_metadata --------------------------------------------------------------------- @@ -102,12 +102,21 @@ citus_schema_distribute (1 row) +step s1-lock-schema-row: + SELECT nspname FROM pg_namespace WHERE nspname = 'tenant1' FOR UPDATE; + +nspname +--------------------------------------------------------------------- +tenant1 +(1 row) + step s2-rename-schema: ALTER SCHEMA tenant1 RENAME TO tenant2; - + step s1-commit: COMMIT; +step s2-rename-schema: <... completed> step s1-verify-distributed-schema: SELECT logicalrelid, partmethod, partkey, (colocationid = (SELECT colocationid AS tenant_colocid FROM pg_dist_schema)) AS is_correct_colocid, repmodel, autoconverted FROM pg_dist_partition WHERE logicalrelid::text LIKE 'tenant%' ORDER BY logicalrelid; @@ -124,7 +133,7 @@ citus_remove_node (1 row) -starting permutation: s1-schema-distribute s1-begin s1-schema-undistribute s2-rename-schema s1-commit s1-verify-distributed-schema +starting permutation: s1-schema-distribute s1-begin s1-schema-undistribute s1-lock-schema-row s2-rename-schema s1-commit s1-verify-distributed-schema citus_add_local_table_to_metadata --------------------------------------------------------------------- @@ -150,12 +159,21 @@ citus_schema_undistribute (1 row) +step s1-lock-schema-row: + SELECT nspname FROM pg_namespace WHERE nspname = 'tenant1' FOR UPDATE; + +nspname +--------------------------------------------------------------------- +tenant1 +(1 row) + step s2-rename-schema: ALTER SCHEMA tenant1 RENAME TO tenant2; - + step s1-commit: COMMIT; +step s2-rename-schema: <... completed> step s1-verify-distributed-schema: SELECT logicalrelid, partmethod, partkey, (colocationid = (SELECT colocationid AS tenant_colocid FROM pg_dist_schema)) AS is_correct_colocid, repmodel, autoconverted FROM pg_dist_partition WHERE logicalrelid::text LIKE 'tenant%' ORDER BY logicalrelid; diff --git a/src/test/regress/expected/local_dist_join.out b/src/test/regress/expected/local_dist_join.out index 68a71bbc1aa..f85a51a3f05 100644 --- a/src/test/regress/expected/local_dist_join.out +++ b/src/test/regress/expected/local_dist_join.out @@ -491,6 +491,93 @@ SELECT count(*) FROM local LEFT JOIN distributed USING (id); 101 (1 row) +SELECT count(*) FROM distributed RIGHT JOIN local USING (id); + count +--------------------------------------------------------------------- + 101 +(1 row) + +SELECT count(*) FROM (distributed d1 LEFT JOIN distributed d2 ON d1.id = d2.id) +RIGHT JOIN local l ON d1.id = l.id; + count +--------------------------------------------------------------------- + 101 +(1 row) + +-- PostgreSQL can reduce FULL to LEFT/RIGHT and then remove the distributed side. +SELECT count(*) FROM local l FULL JOIN distributed d ON l.id = d.id WHERE l.id IS NOT NULL; + count +--------------------------------------------------------------------- + 101 +(1 row) + +SELECT count(*) FROM distributed d FULL JOIN local l ON l.id = d.id WHERE l.id IS NOT NULL; + count +--------------------------------------------------------------------- + 101 +(1 row) + +SELECT count(*) FROM local l FULL JOIN (distributed d1 LEFT JOIN distributed d2 USING (id)) q +ON l.id = q.id WHERE l.id IS NOT NULL; + count +--------------------------------------------------------------------- + 101 +(1 row) + +SELECT joined.id FROM (local LEFT JOIN distributed USING (id)) AS joined ORDER BY 1 LIMIT 1; + id +--------------------------------------------------------------------- + 0 +(1 row) + +WITH joined AS MATERIALIZED (SELECT count(*) AS n FROM local LEFT JOIN distributed USING (id)) +SELECT n FROM joined; + n +--------------------------------------------------------------------- + 101 +(1 row) + +-- A surviving distributed subquery must not prevent join normalization. +SELECT count(*) FROM local l LEFT JOIN distributed d USING (id) +CROSS JOIN (SELECT count(*) FROM distributed) s; + count +--------------------------------------------------------------------- + 101 +(1 row) + +-- Normalize the SELECT without losing an unreferenced modifying CTE's effects. +BEGIN; +WITH m AS (DELETE FROM distributed WHERE id < 2 RETURNING id) +SELECT count(*) FROM local l LEFT JOIN distributed d USING (id); + count +--------------------------------------------------------------------- + 101 +(1 row) + +SELECT count(*) FROM distributed; + count +--------------------------------------------------------------------- + 99 +(1 row) + +ROLLBACK; +-- A planned subquery is not an eliminated nullable relation. +WITH joined AS ( + SELECT r.id FROM outer_join_ref r + WHERE r.id NOT IN ( + SELECT r2.id FROM outer_join_ref r2 LEFT JOIN outer_join_dist d USING (id) + WHERE d.id IN (SELECT id FROM outer_join_dist) + ORDER BY id + ) + ORDER BY id +) +SELECT count(*), avg(result.id) +FROM (SELECT a.id FROM joined a FULL JOIN joined b USING (id) WHERE b.id > 3) result; + count | avg +--------------------------------------------------------------------- + 20 | 59.5000000000000000 +(1 row) + SELECT id, name FROM distributed LEFT JOIN local USING (id) ORDER BY 1 LIMIT 1; id | name --------------------------------------------------------------------- diff --git a/src/test/regress/expected/local_dist_join_load.out b/src/test/regress/expected/local_dist_join_load.out index ce68edc8d73..252eebd682f 100644 --- a/src/test/regress/expected/local_dist_join_load.out +++ b/src/test/regress/expected/local_dist_join_load.out @@ -37,3 +37,41 @@ ALTER TABLE reference DROP column a; INSERT INTO distributed SELECT i, i::text, now() FROM generate_series(0,100)i; INSERT INTO reference SELECT i, i::text FROM generate_series(0,100)i; INSERT INTO local SELECT i, i::text FROM generate_series(0,100)i; +-- Data for the planned-subquery outer join regression. +CREATE TABLE outer_join_ref (id int); +SELECT create_reference_table('outer_join_ref'); + create_reference_table +--------------------------------------------------------------------- + +(1 row) + +CREATE TABLE outer_join_dist (id int); +SELECT create_distributed_table('outer_join_dist', 'id'); + create_distributed_table +--------------------------------------------------------------------- + +(1 row) + +INSERT INTO outer_join_ref SELECT generate_series(0, 10); +INSERT INTO outer_join_ref SELECT generate_series(50, 70); +INSERT INTO outer_join_ref VALUES (NULL), (NULL), (0); +INSERT INTO outer_join_dist SELECT generate_series(0, 10); +INSERT INTO outer_join_dist SELECT generate_series(70, 90); +INSERT INTO outer_join_dist VALUES (0); +-- An eliminated relation without dropped columns, and a view stored before +-- the table gained a column. +CREATE TABLE distributed_dense (id bigint PRIMARY KEY, name text); +SELECT create_distributed_table('distributed_dense', 'id'); + create_distributed_table +--------------------------------------------------------------------- + +(1 row) + +INSERT INTO distributed_dense SELECT id, name FROM distributed; +-- PostgresConfig does not distribute the table and warns about the view. +SET client_min_messages TO ERROR; +CREATE VIEW dense_row_view AS + SELECT r.id, d AS row_value + FROM reference r LEFT JOIN distributed_dense d USING (id); +RESET client_min_messages; +ALTER TABLE distributed_dense ADD COLUMN added text; diff --git a/src/test/regress/expected/local_dist_join_mixed.out b/src/test/regress/expected/local_dist_join_mixed.out index e3e25f7a01d..2c48204bf53 100644 --- a/src/test/regress/expected/local_dist_join_mixed.out +++ b/src/test/regress/expected/local_dist_join_mixed.out @@ -415,16 +415,15 @@ DEBUG: push down of limit count: 4 194 (4 rows) +-- Join removal changes the debug plan across PostgreSQL minor versions. +SET client_min_messages TO WARNING; SELECT count(*) FROM distributed d1 JOIN local USING (id) LEFT JOIN distributed d2 USING (id) ORDER BY 1 DESC LIMIT 4; -DEBUG: Wrapping relation "local" to a subquery -DEBUG: generating subplan XXX_1 for subquery SELECT id FROM local_dist_join_mixed.local WHERE true -DEBUG: Plan XXX query after replacing subqueries and CTEs: SELECT count(*) AS count FROM ((local_dist_join_mixed.distributed d1 JOIN (SELECT NULL::integer AS "dummy-1", local_1.id, NULL::integer AS "dummy-3", NULL::text AS title, NULL::integer AS "dummy-5" FROM (SELECT intermediate_result.id FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(id bigint)) local_1) local USING (id)) LEFT JOIN local_dist_join_mixed.distributed d2 USING (id)) ORDER BY (count(*)) DESC LIMIT 4 -DEBUG: push down of limit count: 4 count --------------------------------------------------------------------- 101 (1 row) +SET client_min_messages TO DEBUG1; SELECT count(DISTINCT d1.name::int * local.id) FROM distributed d1 JOIN local USING (id); DEBUG: Wrapping relation "local" to a subquery DEBUG: generating subplan XXX_1 for subquery SELECT id FROM local_dist_join_mixed.local WHERE true @@ -1190,15 +1189,16 @@ DEBUG: Plan XXX query after replacing subqueries and CTEs: SELECT count(*) AS c 101 (1 row) +-- PostgreSQL 16.16 / 17.12 / 18.7 remove the nullable "distributed" side earlier, so +-- whether "local" gets wrapped depends on the minor version; only check the count. +SET client_min_messages TO WARNING; SELECT count(*) FROM local LEFT JOIN distributed USING (id); -DEBUG: Wrapping relation "local" to a subquery -DEBUG: generating subplan XXX_1 for subquery SELECT id FROM local_dist_join_mixed.local WHERE true -DEBUG: Plan XXX query after replacing subqueries and CTEs: SELECT count(*) AS count FROM ((SELECT NULL::integer AS "dummy-1", local_1.id, NULL::integer AS "dummy-3", NULL::text AS title, NULL::integer AS "dummy-5" FROM (SELECT intermediate_result.id FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(id bigint)) local_1) local LEFT JOIN local_dist_join_mixed.distributed USING (id)) count --------------------------------------------------------------------- 101 (1 row) +SET client_min_messages TO DEBUG1; SELECT id, name FROM distributed LEFT JOIN local USING (id) ORDER BY 1 LIMIT 1; DEBUG: Wrapping relation "local" to a subquery DEBUG: generating subplan XXX_1 for subquery SELECT NULL::integer AS "dummy-1" FROM local_dist_join_mixed.local WHERE true diff --git a/src/test/regress/expected/multi_mx_hide_shard_names.out b/src/test/regress/expected/multi_mx_hide_shard_names.out index 4a8225d4b70..7b121a9549e 100644 --- a/src/test/regress/expected/multi_mx_hide_shard_names.out +++ b/src/test/regress/expected/multi_mx_hide_shard_names.out @@ -477,6 +477,24 @@ SELECT relname FROM pg_catalog.pg_class WHERE relnamespace = 'mx_hide_shard_name test_table_2_1130000 (4 rows) +-- shards stay hidden when pg_class is on the nullable side of an outer join, +-- and the outer row is null-extended instead of being removed +SELECT n.nspname, count(c.oid) FROM pg_catalog.pg_namespace n +LEFT JOIN pg_catalog.pg_class c ON c.relnamespace = n.oid AND c.relname = 'test_table_1130000' +WHERE n.nspname = 'mx_hide_shard_names' GROUP BY n.nspname; + nspname | count +--------------------------------------------------------------------- + mx_hide_shard_names | 0 +(1 row) + +SELECT n.nspname, count(c.oid) FROM pg_catalog.pg_class c +RIGHT JOIN pg_catalog.pg_namespace n ON c.relnamespace = n.oid AND c.relname = 'test_table_1130000' +WHERE n.nspname = 'mx_hide_shard_names' GROUP BY n.nspname; + nspname | count +--------------------------------------------------------------------- + mx_hide_shard_names | 0 +(1 row) + -- Relevant Pg17 commit: -- https://github.com/postgres/postgres/commit/067701f57758f9baed5bd9d868539738d77bfa92 -- Relevant PG18 commit: diff --git a/src/test/regress/expected/multi_mx_hide_shard_names_0.out b/src/test/regress/expected/multi_mx_hide_shard_names_0.out index 02b958df01b..841b7e7abe6 100644 --- a/src/test/regress/expected/multi_mx_hide_shard_names_0.out +++ b/src/test/regress/expected/multi_mx_hide_shard_names_0.out @@ -478,6 +478,24 @@ SELECT relname FROM pg_catalog.pg_class WHERE relnamespace = 'mx_hide_shard_name test_table_2_1130000 (4 rows) +-- shards stay hidden when pg_class is on the nullable side of an outer join, +-- and the outer row is null-extended instead of being removed +SELECT n.nspname, count(c.oid) FROM pg_catalog.pg_namespace n +LEFT JOIN pg_catalog.pg_class c ON c.relnamespace = n.oid AND c.relname = 'test_table_1130000' +WHERE n.nspname = 'mx_hide_shard_names' GROUP BY n.nspname; + nspname | count +--------------------------------------------------------------------- + mx_hide_shard_names | 0 +(1 row) + +SELECT n.nspname, count(c.oid) FROM pg_catalog.pg_class c +RIGHT JOIN pg_catalog.pg_namespace n ON c.relnamespace = n.oid AND c.relname = 'test_table_1130000' +WHERE n.nspname = 'mx_hide_shard_names' GROUP BY n.nspname; + nspname | count +--------------------------------------------------------------------- + mx_hide_shard_names | 0 +(1 row) + -- Relevant Pg17 commit: -- https://github.com/postgres/postgres/commit/067701f57758f9baed5bd9d868539738d77bfa92 -- Relevant PG18 commit: diff --git a/src/test/regress/spec/isolation_citus_schema_distribute_undistribute.spec b/src/test/regress/spec/isolation_citus_schema_distribute_undistribute.spec index bb40918f7bb..42a9c63211a 100644 --- a/src/test/regress/spec/isolation_citus_schema_distribute_undistribute.spec +++ b/src/test/regress/spec/isolation_citus_schema_distribute_undistribute.spec @@ -50,6 +50,14 @@ step "s1-commit" COMMIT; } +// ALTER SCHEMA RENAME updates the schema's pg_namespace row. Lock that row so the +// rename waits for s1 on every PostgreSQL minor version, not only on those that +// also lock the schema itself during rename (17.12/18.7/19rc2, CVE-2026-6467). +step "s1-lock-schema-row" +{ + SELECT nspname FROM pg_namespace WHERE nspname = 'tenant1' FOR UPDATE; +} + session "s2" step "s2-drop-schema" @@ -125,8 +133,8 @@ permutation "s1-begin" "s1-schema-distribute" "s2-drop-schema" "s1-commit" "s1-v permutation "s1-schema-distribute" "s1-begin" "s1-schema-undistribute" "s2-drop-schema" "s1-commit" "s1-verify-distributed-schema" // RENAME SCHEMA -permutation "s1-begin" "s1-schema-distribute" "s2-rename-schema" "s1-commit" "s1-verify-distributed-schema" -permutation "s1-schema-distribute" "s1-begin" "s1-schema-undistribute" "s2-rename-schema" "s1-commit" "s1-verify-distributed-schema" +permutation "s1-begin" "s1-schema-distribute" "s1-lock-schema-row" "s2-rename-schema" "s1-commit" "s1-verify-distributed-schema" +permutation "s1-schema-distribute" "s1-begin" "s1-schema-undistribute" "s1-lock-schema-row" "s2-rename-schema" "s1-commit" "s1-verify-distributed-schema" // CREATE TABLE permutation "s1-begin" "s1-schema-distribute" "s2-add-table" "s1-commit" "s1-verify-distributed-schema" diff --git a/src/test/regress/sql/arbitrary_configs_recurring_outer_join.sql b/src/test/regress/sql/arbitrary_configs_recurring_outer_join.sql index 6f85ab08d99..f0a82a54573 100644 --- a/src/test/regress/sql/arbitrary_configs_recurring_outer_join.sql +++ b/src/test/regress/sql/arbitrary_configs_recurring_outer_join.sql @@ -52,6 +52,52 @@ LEFT JOIN ) t6 USING (id); +-- Dropped-column placeholders must not shift aliases or collide with live names. +SELECT COUNT(*) FROM +local t1 +LEFT JOIN +( + SELECT * FROM + (SELECT * FROM reference t2 JOIN distributed t3 USING (id)) p + JOIN + (SELECT * FROM reference t4 LEFT JOIN distributed t5(id, "dummy-1", "dummy-5") USING (id)) q + USING(id) +) t6 +USING (id); + +-- Remap multiple replacements, including whole-row and correlated references. +-- Return a boolean: non-MX workers do not have the table's composite type. +SELECT COUNT(*) FROM +local t1 +LEFT JOIN +( + SELECT * FROM + (SELECT * FROM reference t2 JOIN distributed t3 USING (id)) p + JOIN + (SELECT t4.*, (t5 IS NULL) AS nullable_row_is_null, (SELECT t7.id) AS correlated_id + FROM reference t4 + LEFT JOIN distributed t5 USING (id) + LEFT JOIN distributed t7 USING (id)) q + USING(id) +) t6 +USING (id); + +-- Without dropped columns, system-column and whole-row Vars must be remapped too. +SELECT COUNT(*) FROM +local t1 +LEFT JOIN +( + SELECT * FROM + (SELECT * FROM reference t2 JOIN distributed t3 USING (id)) p + JOIN + (SELECT t4.*, (t5.ctid IS NULL) AS no_tid + FROM reference t4 + LEFT JOIN distributed_dense t5 USING (id)) q + USING(id) +) t6 +USING (id); +SELECT COUNT(*) FROM local LEFT JOIN dense_row_view USING (id); + BEGIN; WITH cte AS ( DELETE FROM distributed diff --git a/src/test/regress/sql/citus_depended_object.sql b/src/test/regress/sql/citus_depended_object.sql index a01b0fa9ab6..b3574c68822 100644 --- a/src/test/regress/sql/citus_depended_object.sql +++ b/src/test/regress/sql/citus_depended_object.sql @@ -151,6 +151,15 @@ SELECT proname, FROM (VALUES ('master_add_node'), ('format'), ('citus_depended_proc'), ('citus_independed_proc')) procs(proname); +-- citus objects stay hidden when the meta table is on the nullable side of an +-- outer join, and the outer row is null-extended instead of being removed +SET citus.hide_citus_dependent_objects TO true; +SELECT n.nspname, count(c.oid) FROM pg_namespace n +LEFT JOIN pg_class c ON c.relnamespace = n.oid AND c.relname = 'pg_dist_shard' +WHERE n.nspname = 'pg_catalog' GROUP BY n.nspname; + +RESET citus.hide_citus_dependent_objects; + -- drop the namespace with all its objects DROP SCHEMA citus_dependend_object CASCADE; diff --git a/src/test/regress/sql/function_propagation.sql b/src/test/regress/sql/function_propagation.sql index 165e0b017ba..e9438d361e5 100644 --- a/src/test/regress/sql/function_propagation.sql +++ b/src/test/regress/sql/function_propagation.sql @@ -766,7 +766,7 @@ SELECT distribution_argument_index, colocationid, force_delegation FROM pg_catal -- Show that causing circular dependency via functions and default values are not allowed -CREATE TABLE table_1_for_circ_dep(id int); +CREATE TABLE table_1_for_circ_dep(id int, col_2 int); select create_distributed_table('table_1_for_circ_dep','id'); CREATE OR REPLACE FUNCTION func_1_for_circ_dep(col_1 table_1_for_circ_dep) @@ -789,8 +789,11 @@ return 1; END; $$; --- It should error out due to circular dependency -ALTER TABLE table_1_for_circ_dep ADD COLUMN col_2 int default func_2_for_circ_dep(NULL::table_2_for_circ_dep); +-- It should error out due to circular dependency. Set the default on an existing +-- column: PostgreSQL 17.12/18.7/19rc2 reject ADD COLUMN here before Citus can +-- detect the cycle, because table_2_for_circ_dep's default uses this row type +-- (CVE-2026-6460). +ALTER TABLE table_1_for_circ_dep ALTER COLUMN col_2 SET DEFAULT func_2_for_circ_dep(NULL::table_2_for_circ_dep); -- Show that causing circular dependency via functions and constraints are not allowed diff --git a/src/test/regress/sql/local_dist_join.sql b/src/test/regress/sql/local_dist_join.sql index f92c3f2c95d..185f1f5dd80 100644 --- a/src/test/regress/sql/local_dist_join.sql +++ b/src/test/regress/sql/local_dist_join.sql @@ -210,6 +210,42 @@ SELECT count(*) FROM distributed CROSS JOIN local WHERE distributed.id = 1; SELECT count(*) FROM distributed LEFT JOIN local USING (id); SELECT count(*) FROM local LEFT JOIN distributed USING (id); +SELECT count(*) FROM distributed RIGHT JOIN local USING (id); +SELECT count(*) FROM (distributed d1 LEFT JOIN distributed d2 ON d1.id = d2.id) +RIGHT JOIN local l ON d1.id = l.id; +-- PostgreSQL can reduce FULL to LEFT/RIGHT and then remove the distributed side. +SELECT count(*) FROM local l FULL JOIN distributed d ON l.id = d.id WHERE l.id IS NOT NULL; +SELECT count(*) FROM distributed d FULL JOIN local l ON l.id = d.id WHERE l.id IS NOT NULL; +SELECT count(*) FROM local l FULL JOIN (distributed d1 LEFT JOIN distributed d2 USING (id)) q +ON l.id = q.id WHERE l.id IS NOT NULL; +SELECT joined.id FROM (local LEFT JOIN distributed USING (id)) AS joined ORDER BY 1 LIMIT 1; +WITH joined AS MATERIALIZED (SELECT count(*) AS n FROM local LEFT JOIN distributed USING (id)) +SELECT n FROM joined; + +-- A surviving distributed subquery must not prevent join normalization. +SELECT count(*) FROM local l LEFT JOIN distributed d USING (id) +CROSS JOIN (SELECT count(*) FROM distributed) s; + +-- Normalize the SELECT without losing an unreferenced modifying CTE's effects. +BEGIN; +WITH m AS (DELETE FROM distributed WHERE id < 2 RETURNING id) +SELECT count(*) FROM local l LEFT JOIN distributed d USING (id); +SELECT count(*) FROM distributed; +ROLLBACK; + +-- A planned subquery is not an eliminated nullable relation. +WITH joined AS ( + SELECT r.id FROM outer_join_ref r + WHERE r.id NOT IN ( + SELECT r2.id FROM outer_join_ref r2 LEFT JOIN outer_join_dist d USING (id) + WHERE d.id IN (SELECT id FROM outer_join_dist) + ORDER BY id + ) + ORDER BY id +) +SELECT count(*), avg(result.id) +FROM (SELECT a.id FROM joined a FULL JOIN joined b USING (id) WHERE b.id > 3) result; + SELECT id, name FROM distributed LEFT JOIN local USING (id) ORDER BY 1 LIMIT 1; SELECT diff --git a/src/test/regress/sql/local_dist_join_load.sql b/src/test/regress/sql/local_dist_join_load.sql index 53cc668f8a4..781063693a2 100644 --- a/src/test/regress/sql/local_dist_join_load.sql +++ b/src/test/regress/sql/local_dist_join_load.sql @@ -31,3 +31,28 @@ ALTER TABLE reference DROP column a; INSERT INTO distributed SELECT i, i::text, now() FROM generate_series(0,100)i; INSERT INTO reference SELECT i, i::text FROM generate_series(0,100)i; INSERT INTO local SELECT i, i::text FROM generate_series(0,100)i; + +-- Data for the planned-subquery outer join regression. +CREATE TABLE outer_join_ref (id int); +SELECT create_reference_table('outer_join_ref'); +CREATE TABLE outer_join_dist (id int); +SELECT create_distributed_table('outer_join_dist', 'id'); +INSERT INTO outer_join_ref SELECT generate_series(0, 10); +INSERT INTO outer_join_ref SELECT generate_series(50, 70); +INSERT INTO outer_join_ref VALUES (NULL), (NULL), (0); +INSERT INTO outer_join_dist SELECT generate_series(0, 10); +INSERT INTO outer_join_dist SELECT generate_series(70, 90); +INSERT INTO outer_join_dist VALUES (0); + +-- An eliminated relation without dropped columns, and a view stored before +-- the table gained a column. +CREATE TABLE distributed_dense (id bigint PRIMARY KEY, name text); +SELECT create_distributed_table('distributed_dense', 'id'); +INSERT INTO distributed_dense SELECT id, name FROM distributed; +-- PostgresConfig does not distribute the table and warns about the view. +SET client_min_messages TO ERROR; +CREATE VIEW dense_row_view AS + SELECT r.id, d AS row_value + FROM reference r LEFT JOIN distributed_dense d USING (id); +RESET client_min_messages; +ALTER TABLE distributed_dense ADD COLUMN added text; diff --git a/src/test/regress/sql/local_dist_join_mixed.sql b/src/test/regress/sql/local_dist_join_mixed.sql index 14b0c607694..1853b71d2ec 100644 --- a/src/test/regress/sql/local_dist_join_mixed.sql +++ b/src/test/regress/sql/local_dist_join_mixed.sql @@ -92,7 +92,10 @@ SELECT COUNT(*) FROM (distributed d1(x,y,y1) JOIN local l1(x,t) USING (x)) AS t( -- final queries are pushdown queries SELECT sum(d1.id + local.id) FROM distributed d1 JOIN local USING (id); SELECT sum(d1.id + local.id) OVER (PARTITION BY d1.id) FROM distributed d1 JOIN local USING (id) ORDER BY 1 DESC LIMIT 4; +-- Join removal changes the debug plan across PostgreSQL minor versions. +SET client_min_messages TO WARNING; SELECT count(*) FROM distributed d1 JOIN local USING (id) LEFT JOIN distributed d2 USING (id) ORDER BY 1 DESC LIMIT 4; +SET client_min_messages TO DEBUG1; SELECT count(DISTINCT d1.name::int * local.id) FROM distributed d1 JOIN local USING (id); -- final queries are router queries @@ -313,7 +316,11 @@ SELECT count(*) FROM distributed CROSS JOIN local WHERE distributed.id = 1; -- w count(*) it works fine as PG ignores the inner tables SELECT count(*) FROM distributed LEFT JOIN local USING (id); +-- PostgreSQL 16.16 / 17.12 / 18.7 remove the nullable "distributed" side earlier, so +-- whether "local" gets wrapped depends on the minor version; only check the count. +SET client_min_messages TO WARNING; SELECT count(*) FROM local LEFT JOIN distributed USING (id); +SET client_min_messages TO DEBUG1; SELECT id, name FROM distributed LEFT JOIN local USING (id) ORDER BY 1 LIMIT 1; SELECT id, name FROM local LEFT JOIN distributed USING (id) ORDER BY 1 LIMIT 1; diff --git a/src/test/regress/sql/multi_mx_hide_shard_names.sql b/src/test/regress/sql/multi_mx_hide_shard_names.sql index d123841762f..c72a351c51d 100644 --- a/src/test/regress/sql/multi_mx_hide_shard_names.sql +++ b/src/test/regress/sql/multi_mx_hide_shard_names.sql @@ -251,6 +251,15 @@ RESET citus.enable_metadata_sync; -- the shards and indexes do not show up SELECT relname FROM pg_catalog.pg_class WHERE relnamespace = 'mx_hide_shard_names'::regnamespace ORDER BY relname; +-- shards stay hidden when pg_class is on the nullable side of an outer join, +-- and the outer row is null-extended instead of being removed +SELECT n.nspname, count(c.oid) FROM pg_catalog.pg_namespace n +LEFT JOIN pg_catalog.pg_class c ON c.relnamespace = n.oid AND c.relname = 'test_table_1130000' +WHERE n.nspname = 'mx_hide_shard_names' GROUP BY n.nspname; +SELECT n.nspname, count(c.oid) FROM pg_catalog.pg_class c +RIGHT JOIN pg_catalog.pg_namespace n ON c.relnamespace = n.oid AND c.relname = 'test_table_1130000' +WHERE n.nspname = 'mx_hide_shard_names' GROUP BY n.nspname; + -- Relevant Pg17 commit: -- https://github.com/postgres/postgres/commit/067701f57758f9baed5bd9d868539738d77bfa92 -- Relevant PG18 commit: