Merge branch 'antalya-26.1' into feature/antalya-26.1/json_part2

Author: ianton-ru

ci/jobs/scripts/workflow_hooks/pr_body_check.py

@@ -60,6 +60,11 @@ def check_changelog_entry(category, pr_body: str) -> str:
     if not title or not body:
         print("WARNING: Failed to get PR title or body, read from environment")
         body = Info().pr_body
+        labels = Info().pr_labels
+
+    if "release" in labels or "release-lts" in labels:
+        print("NOTE: Release PR detected, skipping changelog entry check")
+        sys.exit(0)
 
     error, category = get_category(body)
     if error or not category:

ci/jobs/scripts/workflow_hooks/pr_labels_and_category.py

@@ -181,6 +181,9 @@ def check_labels(category, info):
 
 if __name__ == "__main__":
     info = Info()
+    if Labels.RELEASE in info.pr_labels or Labels.RELEASE_LTS in info.pr_labels:
+        print("NOTE: Release PR detected, skipping changelog category check")
+        sys.exit(0)
     error, category = get_category(info.pr_body)
     if not category or error:
         print(f"ERROR: {error}")

cmake/autogenerated_versions.txt

@@ -2,13 +2,13 @@
 
 # NOTE: VERSION_REVISION has nothing common with DBMS_TCP_PROTOCOL_VERSION,
 # only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
-SET(VERSION_REVISION 54508)
+SET(VERSION_REVISION 54509)
 SET(VERSION_MAJOR 26)
 SET(VERSION_MINOR 1)
-SET(VERSION_PATCH 3)
-SET(VERSION_GITHASH 53779390caa67a65a2368cdbb7533ed925608ba9)
-SET(VERSION_DESCRIBE v26.1.3.20001.altinityantalya)
-SET(VERSION_STRING 26.1.3.20001.altinityantalya)
+SET(VERSION_PATCH 4)
+SET(VERSION_GITHASH 5549f2acae95c6d627654f50e212a85d059a55f9)
+SET(VERSION_DESCRIBE v26.1.4.20001.altinityantalya)
+SET(VERSION_STRING 26.1.4.20001.altinityantalya)
 # end of autochange
 
 SET(VERSION_TWEAK 20001)

src/Access/IAccessStorage.cpp

@@ -547,7 +547,7 @@ std::optional<AuthResult> IAccessStorage::authenticateImpl(
     {
         if (auto user = tryRead<User>(*id))
         {
-            AuthResult auth_result { .user_id = *id };
+            AuthResult auth_result { .user_id = *id, .user_name = credentials.getUserName() };
             if (!isAddressAllowed(*user, address))
                 throwAddressNotAllowed(address);
 

src/Access/IAccessStorage.h

@@ -33,6 +33,9 @@ struct AuthResult
     /// Session settings received from authentication server (if any)
     SettingsChanges settings{};
     AuthenticationData authentication_data {};
+    /// Username determined by the access storage during authentication,
+    /// should be treated as the authenticated user name
+    String user_name;
 };
 
 /// Contains entities, i.e. instances of classes derived from IAccessEntity.

src/Access/LDAPAccessStorage.cpp

@@ -490,7 +490,7 @@ std::optional<AuthResult> LDAPAccessStorage::authenticateImpl(
     }
 
     if (id)
-        return AuthResult{ .user_id = *id, .authentication_data = AuthenticationData(AuthenticationType::LDAP) };
+        return AuthResult{ .user_id = *id, .authentication_data = AuthenticationData(AuthenticationType::LDAP), .user_name = credentials.getUserName() };
     return std::nullopt;
 }
 

src/Access/TokenAccessStorage.cpp

@@ -583,7 +583,7 @@ std::optional<AuthResult> TokenAccessStorage::authenticateImpl(
     }
 
     if (id)
-        return AuthResult{ .user_id = *id, .authentication_data = AuthenticationData(AuthenticationType::JWT) };
+        return AuthResult{ .user_id = *id, .authentication_data = AuthenticationData(AuthenticationType::JWT), .user_name = credentials.getUserName()  };
     return std::nullopt;
 }
 

src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp

@@ -366,6 +366,18 @@ std::map<std::pair<TypeIndex, String>, NodeToSubcolumnTransformer> node_transfor
             NameAndTypePair column{ctx.column.name + ".null", std::make_shared<DataTypeUInt8>()};
             if (sourceHasColumn(ctx.column_source, column.name) || !canOptimizeToSubcolumn(ctx.column_source, column.name))
                 return;
+
+            /// For nested Nullable types (e.g. Nullable(Tuple(... Nullable(T) ...))),
+            /// the .null subcolumn in storage is Nullable(UInt8), not UInt8.
+            /// Using it with a hardcoded UInt8 type causes a type mismatch at runtime.
+            if (auto * table_node = ctx.column_source->as<TableNode>())
+            {
+                auto actual = table_node->getStorageSnapshot()->tryGetColumn(
+                    GetColumnsOptions(GetColumnsOptions::All).withRegularSubcolumns(), column.name);
+                if (actual && actual->type->isNullable())
+                    return;
+            }
+
             node = std::make_shared<ColumnNode>(column, ctx.column_source);
         },
     },
@@ -377,6 +389,16 @@ std::map<std::pair<TypeIndex, String>, NodeToSubcolumnTransformer> node_transfor
             NameAndTypePair column{ctx.column.name + ".null", std::make_shared<DataTypeUInt8>()};
             if (sourceHasColumn(ctx.column_source, column.name) || !canOptimizeToSubcolumn(ctx.column_source, column.name))
                 return;
+
+            /// Same guard as isNull above: nested Nullable .null subcolumn may itself be Nullable.
+            if (auto * table_node = ctx.column_source->as<TableNode>())
+            {
+                auto actual = table_node->getStorageSnapshot()->tryGetColumn(
+                    GetColumnsOptions(GetColumnsOptions::All).withRegularSubcolumns(), column.name);
+                if (actual && actual->type->isNullable())
+                    return;
+            }
+
             auto & function_arguments_nodes = function_node.getArguments().getNodes();
 
             function_arguments_nodes = {std::make_shared<ColumnNode>(column, ctx.column_source)};

src/Analyzer/Passes/InverseDictionaryLookupPass.cpp

@@ -15,6 +15,8 @@
 
 #include <Functions/FunctionsExternalDictionaries.h>
 
+#include <Access/ContextAccess.h>
+#include <Access/Common/AccessType.h>
 #include <Core/Settings.h>
 #include <Common/typeid_cast.h>
 
@@ -140,6 +142,12 @@ class InverseDictionaryLookupVisitor : public InDepthQueryTreeVisitorWithContext
         if (getSettings()[Setting::rewrite_in_to_join])
             return;
 
+        /// This rewrite turns `dictGet(...)` predicates into `IN (SELECT ... FROM dictionary(...))`.
+        /// The `dictionary()` table function requires `CREATE TEMPORARY TABLE`; if that grant is missing,
+        /// skip the optimization to avoid `ACCESS_DENIED`.
+        if (!getContext()->getAccess()->isGranted(AccessType::CREATE_TEMPORARY_TABLE))
+            return;
+
         auto * node_function = node->as<FunctionNode>();
 
         if (!node_function)

src/Columns/ColumnConst.h

@@ -122,11 +122,12 @@ class ColumnConst final : public COWHelper<IColumnHelper<ColumnConst>, ColumnCon
     }
 
 #if !defined(DEBUG_OR_SANITIZER_BUILD)
-    void insertRangeFrom(const IColumn &, size_t /*start*/, size_t length) override
+    void insertRangeFrom(const IColumn & src, size_t /*start*/, size_t length) override
 #else
-    void doInsertRangeFrom(const IColumn &, size_t /*start*/, size_t length) override
+    void doInsertRangeFrom(const IColumn & src, size_t /*start*/, size_t length) override
 #endif
     {
+        chassert(!typeid_cast<const ColumnConst *>(&src) || data->compareAt(0, 0, *typeid_cast<const ColumnConst &>(src).data, -1) == 0);
         s += length;
     }