database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Merge branch 'develop' into MCOL-4841

Browse Source 
# Conflicts:
#	exemgr/main.cpp
#	oam/etc/Columnstore.xml.singleserver
#	primitives/primproc/primproc.cpp
This commit is contained in:
david.hall
2022-06-09 10:07:26 -05:00
parent a98834e31c 2ad4ae2cd2
commit 3b6449842f
523 changed files with 32140 additions and 8380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
primitives/blockcache/blockcacheclient.h
View File

@ -176,4 +176,3 @@ class blockCacheClient
} // namespace dbbc
// vim:ts=4 sw=4:

1
primitives/blockcache/blockrequestprocessor.h
View File

@ -190,4 +190,3 @@ class BlockRequestProcessor
};
} // namespace dbbc
// vim:ts=4 sw=4:

1
primitives/blockcache/filerequest.h
View File

@ -320,4 +320,3 @@ class fileRequest
} // namespace dbbc
// vim:ts=4 sw=4:

1
primitives/blockcache/iomanager.cpp
View File

@ -1442,4 +1442,3 @@ void ioManager::handleBlockReadError(fileRequest* fr, const string& errMsg, bool
}
} // namespace dbbc
// vim:ts=4 sw=4:

1
primitives/blockcache/iomanager.h
View File

@ -147,4 +147,3 @@ void dropFDCache();
void purgeFDCache(std::vector<BRM::FileInfo>& files);
} // namespace dbbc
// vim:ts=4 sw=4: