Merge pull request #761 from Altinity/feature/fix_integration_tests

Feature/fix integration tests

Author: Enmk

src/Storages/ObjectStorage/DataLakes/DataLakeConfiguration.h

@@ -172,8 +172,9 @@ class DataLakeConfiguration : public BaseStorageConfiguration, public std::enabl
     LoggerPtr log = getLogger("DataLakeConfiguration");
     const DataLakeStorageSettingsPtr settings;
 
-    void assertInitialized() const
+    void assertInitialized() const override
     {
+        BaseStorageConfiguration::assertInitialized();
         if (!current_metadata)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Metadata is not initialized");
     }
@@ -258,6 +259,7 @@ class StorageIcebergConfiguration : public StorageObjectStorage::Configuration,
     std::string getEngineName() const override { return getImpl().getEngineName(); }
     std::string getNamespaceType() const override { return getImpl().getNamespaceType(); }
 
+    Path getFullPath() const override { return getImpl().getFullPath(); }
     Path getPath() const override { return getImpl().getPath(); }
     void setPath(const Path & path) override { getImpl().setPath(path); }
 
@@ -274,9 +276,14 @@ class StorageIcebergConfiguration : public StorageObjectStorage::Configuration,
         ASTs & args, const String & structure_, const String & format_, ContextPtr context, bool with_structure) override
         { getImpl().addStructureAndFormatToArgsIfNeeded(args, structure_, format_, context, with_structure); }
 
+    bool withPartitionWildcard() const override { return getImpl().withPartitionWildcard(); }
+    bool withGlobsIgnorePartitionWildcard() const override { return getImpl().withGlobsIgnorePartitionWildcard(); }
+    bool isPathWithGlobs() const override { return getImpl().isPathWithGlobs(); }
+    bool isNamespaceWithGlobs() const override { return getImpl().isNamespaceWithGlobs(); }
     std::string getPathWithoutGlobs() const override { return getImpl().getPathWithoutGlobs(); }
 
     bool isArchive() const override { return getImpl().isArchive(); }
+    bool isPathInArchiveWithGlobs() const override { return getImpl().isPathInArchiveWithGlobs(); }
     std::string getPathInArchive() const override { return getImpl().getPathInArchive(); }
 
     void check(ContextPtr context) const override { getImpl().check(context); }
@@ -444,6 +451,8 @@ class StorageIcebergConfiguration : public StorageObjectStorage::Configuration,
         createDynamicStorage(type);
     }
 
+    void assertInitialized() const override { return getImpl().assertInitialized(); }
+
 private:
     inline StorageObjectStorage::Configuration & getImpl() const
     {

src/Storages/ObjectStorage/StorageObjectStorage.h

@@ -219,15 +219,15 @@ class StorageObjectStorage::Configuration
     virtual void addStructureAndFormatToArgsIfNeeded(
         ASTs & args, const String & structure_, const String & format_, ContextPtr context, bool with_structure) = 0;
 
-    bool withPartitionWildcard() const;
+    virtual bool withPartitionWildcard() const;
     bool withGlobs() const { return isPathWithGlobs() || isNamespaceWithGlobs(); }
-    bool withGlobsIgnorePartitionWildcard() const;
-    bool isPathWithGlobs() const;
-    bool isNamespaceWithGlobs() const;
+    virtual bool withGlobsIgnorePartitionWildcard() const;
+    virtual bool isPathWithGlobs() const;
+    virtual bool isNamespaceWithGlobs() const;
     virtual std::string getPathWithoutGlobs() const;
 
     virtual bool isArchive() const { return false; }
-    bool isPathInArchiveWithGlobs() const;
+    virtual bool isPathInArchiveWithGlobs() const;
     virtual std::string getPathInArchive() const;
 
     virtual void check(ContextPtr context) const;
@@ -304,14 +304,14 @@ class StorageObjectStorage::Configuration
     virtual void setCompressionMethod(const String & compression_method_) { compression_method = compression_method_; }
     virtual void setStructure(const String & structure_) { structure = structure_; }
 
+    virtual void assertInitialized() const;
+
 private:
     String format = "auto";
     String compression_method = "auto";
     String structure = "auto";
 
 protected:
-    void assertInitialized() const;
-
     bool initialized = false;
 };
 

src/Storages/ObjectStorage/StorageObjectStorageCluster.cpp

@@ -183,6 +183,8 @@ std::string StorageObjectStorageCluster::getName() const
 
 std::optional<UInt64> StorageObjectStorageCluster::totalRows(ContextPtr query_context) const
 {
+    if (pure_storage)
+        return pure_storage->totalRows(query_context);
     configuration->update(
         object_storage,
         query_context,
@@ -193,6 +195,8 @@ std::optional<UInt64> StorageObjectStorageCluster::totalRows(ContextPtr query_co
 
 std::optional<UInt64> StorageObjectStorageCluster::totalBytes(ContextPtr query_context) const
 {
+    if (pure_storage)
+        return pure_storage->totalBytes(query_context);
     configuration->update(
         object_storage,
         query_context,