stable
This commit is contained in:
IlyaShurupov
parent
34d04c02b0
commit
8788bbacf9
4 changed files with 321 additions and 310 deletions
77
inc/DirectoryTree.hpp
Normal file
77
inc/DirectoryTree.hpp
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
typedef unsigned long long ui64;
|
||||
typedef unsigned long long ui32;
|
||||
|
||||
typedef std::string Key;
|
||||
extern std::string gError;
|
||||
|
||||
struct Node {
|
||||
enum Type : ui32 { NONE, DIRECTORY, FILE, LINK };
|
||||
|
||||
Key key;
|
||||
|
||||
Node* parent = nullptr;
|
||||
Node* left = nullptr;
|
||||
Node* right = nullptr;
|
||||
|
||||
ui32 height = 0;
|
||||
ui32 incomingLinksHard = 0;
|
||||
ui32 incomingLinksDynamic = 0;
|
||||
|
||||
Type type = NONE;
|
||||
|
||||
void updateTreeCache();
|
||||
};
|
||||
|
||||
struct File : public Node {
|
||||
File();
|
||||
};
|
||||
|
||||
struct Link : public Node {
|
||||
Link();
|
||||
|
||||
Node* link = nullptr;
|
||||
bool hard = false;
|
||||
};
|
||||
|
||||
struct Directory : public Node {
|
||||
Directory();
|
||||
|
||||
bool attachNode(const std::vector<Key>& directoryPath, const Key& newKey, Node* newNode);
|
||||
Node* findNode(const std::vector<Key>& path, ui32 currentDepth = 0);
|
||||
void detachNode(Node* node);
|
||||
|
||||
template<typename tFunctor>
|
||||
void traverseInorder(tFunctor functor) const {
|
||||
traverseInorderUtil(members, functor);
|
||||
}
|
||||
|
||||
[[nodiscard]] Node* maxNode() const;
|
||||
[[nodiscard]] ui32 getMaxDepth() const;
|
||||
|
||||
private:
|
||||
Node* treeSearch(const Key& key);
|
||||
void updateTreeLinkCount(Node* node);
|
||||
void treeInsert(const Key& newKey, Node* newNode);
|
||||
Node* insertUtil(Node* head, const Key& key, Node* aNode);
|
||||
Node* rotateLeft(Node* pivot);
|
||||
Node* rotateRight(Node* pivot);
|
||||
static inline ui32 getNodeHeight(const Node* node);
|
||||
void getMaxDepthUtil(ui32 depth, ui32& maxDepth) const;
|
||||
|
||||
template<typename tFunctor>
|
||||
void traverseInorderUtil(Node* node, tFunctor functor) const {
|
||||
if (!node) return;
|
||||
traverseInorderUtil(node->left, functor);
|
||||
functor(node);
|
||||
traverseInorderUtil(node->right, functor);
|
||||
}
|
||||
|
||||
public:
|
||||
Node* members = nullptr;
|
||||
ui32 size = 0;
|
||||
};
|
||||
|
|
@ -1,79 +1,10 @@
|
|||
#pragma once
|
||||
|
||||
#include "Path.hpp"
|
||||
#include "DirectoryTree.hpp"
|
||||
|
||||
#include <sstream>
|
||||
|
||||
typedef std::string Key;
|
||||
typedef unsigned long long ui64;
|
||||
typedef unsigned long long ui32;
|
||||
|
||||
struct Node {
|
||||
enum Type : ui32 { NONE, DIRECTORY, FILE, LINK };
|
||||
|
||||
Key key;
|
||||
|
||||
Node* parent = nullptr;
|
||||
Node* left = nullptr;
|
||||
Node* right = nullptr;
|
||||
|
||||
ui32 height = 0;
|
||||
ui32 incomingLinksHard = 0;
|
||||
ui32 incomingLinksDynamic = 0;
|
||||
|
||||
Type type = NONE;
|
||||
|
||||
void updateTreeCache();
|
||||
};
|
||||
|
||||
struct File : public Node {
|
||||
File();
|
||||
};
|
||||
|
||||
struct Link : public Node {
|
||||
Link();
|
||||
|
||||
Node* link = nullptr;
|
||||
bool hard = false;
|
||||
};
|
||||
|
||||
struct Directory : public Node {
|
||||
Directory();
|
||||
|
||||
bool attachNode(const std::vector<Key>& directoryPath, const Key& newKey, Node* newNode);
|
||||
Node* findNode(const std::vector<Key>& path, ui32 currentDepth = 0);
|
||||
void detachNode(Node* node);
|
||||
|
||||
template<typename tFunctor>
|
||||
void traverseInorder(tFunctor functor) const {
|
||||
traverseInorderUtil(members, functor);
|
||||
}
|
||||
|
||||
[[nodiscard]] Node* maxNode() const;
|
||||
[[nodiscard]] ui32 getMaxDepth() const;
|
||||
|
||||
private:
|
||||
Node* treeSearch(const Key& key);
|
||||
void updateTreeLinkCount(Node* node);
|
||||
void treeInsert(const Key& newKey, Node* newNode);
|
||||
Node* insertUtil(Node* head, const Key& key, Node* aNode);
|
||||
Node* rotateLeft(Node* pivot);
|
||||
Node* rotateRight(Node* pivot);
|
||||
static inline ui32 getNodeHeight(const Node* node);
|
||||
void getMaxDepthUtil(ui32 depth, ui32& maxDepth) const;
|
||||
|
||||
template<typename tFunctor>
|
||||
void traverseInorderUtil(Node* node, tFunctor functor) const {
|
||||
if (!node) return;
|
||||
traverseInorderUtil(node->left, functor);
|
||||
functor(node);
|
||||
traverseInorderUtil(node->right, functor);
|
||||
}
|
||||
|
||||
public:
|
||||
Node* members = nullptr;
|
||||
ui32 size = 0;
|
||||
};
|
||||
|
||||
class FileSystem {
|
||||
public:
|
||||
FileSystem();
|
||||
|
|
|
|||
240
src/DirectoryTree.cpp
Normal file
240
src/DirectoryTree.cpp
Normal file
|
|
@ -0,0 +1,240 @@
|
|||
|
||||
#include "DirectoryTree.hpp"
|
||||
|
||||
std::string gError;
|
||||
|
||||
void Node::updateTreeCache() {
|
||||
// TODO update cache
|
||||
}
|
||||
|
||||
File::File() {
|
||||
type = Type::FILE;
|
||||
}
|
||||
|
||||
Link::Link() {
|
||||
type = LINK;
|
||||
}
|
||||
|
||||
Directory::Directory() {
|
||||
type = DIRECTORY;
|
||||
}
|
||||
|
||||
bool Directory::attachNode(const std::vector<Key>& directoryPath, const Key& newKey, Node* newNode) {
|
||||
Node* node = findNode(directoryPath, 0);
|
||||
if (!node) {
|
||||
gError = "Invalid path";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (node->type != DIRECTORY) {
|
||||
gError = "given path is not a directory";
|
||||
return false;
|
||||
}
|
||||
|
||||
auto directory = ((Directory*) node);
|
||||
|
||||
Node* existingNode = directory->treeSearch(newKey);
|
||||
if (existingNode) {
|
||||
if (existingNode->type == newNode->type) return false; // exit silently
|
||||
gError = "Cant add node";
|
||||
return false;
|
||||
}
|
||||
|
||||
directory->treeInsert(newKey, newNode);
|
||||
updateTreeLinkCount(newNode);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Node* Directory::findNode(const std::vector<Key>& path, ui32 currentDepth) {
|
||||
if (path.size() == currentDepth) {
|
||||
return this;
|
||||
}
|
||||
|
||||
const Key& key = path[currentDepth];
|
||||
Node* node = treeSearch(key);
|
||||
|
||||
if (!node) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
// link on link is not allowed
|
||||
while (true) {
|
||||
switch (node->type) {
|
||||
case Node::FILE:
|
||||
if (currentDepth == path.size() - 1) return node;
|
||||
return nullptr;
|
||||
|
||||
case Node::DIRECTORY:
|
||||
return ((Directory*)node)->findNode(path, ++currentDepth);
|
||||
|
||||
case Node::LINK:
|
||||
node = ((Link*)node)->link;
|
||||
break;
|
||||
|
||||
default:
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Node* Directory::treeSearch(const Key& key) {
|
||||
if (!members) return nullptr;
|
||||
Node* iterator = members;
|
||||
while (iterator) {
|
||||
if (key > iterator->key) {
|
||||
iterator = iterator->right;
|
||||
} else if (key < iterator->key) {
|
||||
iterator = iterator->left;
|
||||
} else {
|
||||
return iterator;
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void Directory::updateTreeLinkCount(Node* node) {
|
||||
// TODO : update all caches all the way up to '/'
|
||||
}
|
||||
|
||||
void Directory::detachNode(Node* node) {
|
||||
// TODO : remove util from avl tree
|
||||
// TODO : update all cache all the way up to the root (due to the links)
|
||||
// TODO : dont relocate nodes (due existing links to the nodes), only change tree pointers
|
||||
}
|
||||
|
||||
// TODO : user avl tree insertion
|
||||
// TODO : check for existing file
|
||||
// TODO : return true if successful (node inserted)
|
||||
// TODO : dont relocate nodes (due existing links to the nodes), only change tree pointers
|
||||
void Directory::treeInsert(const Key& newKey, Node* newNode) {
|
||||
newNode->key = newKey;
|
||||
members = insertUtil(members, newKey, newNode);
|
||||
}
|
||||
|
||||
// recursively returns valid isLeft or isRight child or root
|
||||
Node* Directory::insertUtil(Node* head, const Key& key, Node* aNode) {
|
||||
|
||||
Node* insertedNode;
|
||||
|
||||
if (head == nullptr) {
|
||||
size++;
|
||||
aNode->updateTreeCache();
|
||||
return aNode;
|
||||
} else if (head->key == key) {
|
||||
return head;
|
||||
} else if (key > head->key) {
|
||||
insertedNode = insertUtil(head->right, key, aNode);
|
||||
head->right = insertedNode;
|
||||
insertedNode->parent = head;
|
||||
} else {
|
||||
insertedNode = insertUtil(head->left, key, aNode);
|
||||
head->left = insertedNode;
|
||||
insertedNode->parent = head;
|
||||
}
|
||||
|
||||
// update height
|
||||
head->height = 1 + std::max(getNodeHeight(head->right), getNodeHeight(head->left));
|
||||
|
||||
int balance = int(getNodeHeight(head->right) - getNodeHeight(head->left));
|
||||
|
||||
if (balance > 1) {
|
||||
if (key > head->right->key) {
|
||||
return rotateLeft(head);
|
||||
} else {
|
||||
head->right = rotateRight(head->right);
|
||||
return rotateLeft(head);
|
||||
}
|
||||
} else if (balance < -1) {
|
||||
if (key < head->left->key) {
|
||||
return rotateRight(head);
|
||||
} else {
|
||||
head->left = rotateLeft(head->left);
|
||||
return rotateRight(head);
|
||||
}
|
||||
}
|
||||
|
||||
head->updateTreeCache();
|
||||
|
||||
return head;
|
||||
}
|
||||
|
||||
// returns new head
|
||||
Node* Directory::rotateLeft(Node* pivot) {
|
||||
Node* const head = pivot;
|
||||
Node* const right = pivot->right;
|
||||
Node* const right_left = right->left;
|
||||
Node* const parent = pivot->parent;
|
||||
|
||||
// parents
|
||||
if (right_left) right_left->parent = head;
|
||||
head->parent = right;
|
||||
right->parent = parent;
|
||||
|
||||
// children
|
||||
head->right = right_left;
|
||||
right->left = head;
|
||||
|
||||
// heights
|
||||
head->height = 1 + std::max(getNodeHeight(head->left), getNodeHeight(head->right));
|
||||
right->height = 1 + std::max(getNodeHeight(right->left), getNodeHeight(right->right));
|
||||
|
||||
// cache
|
||||
head->updateTreeCache();
|
||||
right->updateTreeCache();
|
||||
|
||||
return right;
|
||||
}
|
||||
|
||||
Node* Directory::rotateRight(Node* pivot) {
|
||||
Node* const head = pivot;
|
||||
Node* const left = pivot->left;
|
||||
Node* const left_right = left->right;
|
||||
Node* const parent = pivot->parent;
|
||||
|
||||
// parents
|
||||
if (left_right) left_right->parent = head;
|
||||
head->parent = left;
|
||||
left->parent = parent;
|
||||
|
||||
// children
|
||||
head->left = left_right;
|
||||
left->right = head;
|
||||
|
||||
// heights
|
||||
head->height = 1 + std::max(getNodeHeight(head->left), getNodeHeight(head->right));
|
||||
left->height = 1 + std::max(getNodeHeight(left->left), getNodeHeight(left->right));
|
||||
|
||||
// cache
|
||||
head->updateTreeCache();
|
||||
left->updateTreeCache();
|
||||
|
||||
return left;
|
||||
}
|
||||
|
||||
ui32 Directory::getNodeHeight(const Node* node) { return node ? node->height : -1; }
|
||||
|
||||
Node* Directory::maxNode() const {
|
||||
Node* head = members;
|
||||
if (!head) return nullptr;
|
||||
while (head->right != nullptr) {
|
||||
head = head->right;
|
||||
}
|
||||
return head;
|
||||
}
|
||||
|
||||
void Directory::getMaxDepthUtil(ui32 depth, ui32& maxDepth) const {
|
||||
if (!members) return;
|
||||
maxDepth = std::max(depth, maxDepth);
|
||||
traverseInorderUtil(members, [&](Node* node){
|
||||
if (node->type == DIRECTORY) {
|
||||
((Directory*)node)->getMaxDepthUtil(++depth, maxDepth);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
ui32 Directory::getMaxDepth() const {
|
||||
ui32 maxDepth = 1;
|
||||
getMaxDepthUtil(1, maxDepth);
|
||||
return maxDepth;
|
||||
}
|
||||
|
|
@ -1,246 +1,9 @@
|
|||
|
||||
#include "FileSystem.hpp"
|
||||
|
||||
#include <iostream>
|
||||
#include <cassert>
|
||||
|
||||
static std::string gError;
|
||||
|
||||
void Node::updateTreeCache() {
|
||||
// TODO update cache
|
||||
}
|
||||
|
||||
File::File() {
|
||||
type = Type::FILE;
|
||||
}
|
||||
|
||||
Link::Link() {
|
||||
type = LINK;
|
||||
}
|
||||
|
||||
Directory::Directory() {
|
||||
type = DIRECTORY;
|
||||
}
|
||||
|
||||
bool Directory::attachNode(const std::vector<Key>& directoryPath, const Key& newKey, Node* newNode) {
|
||||
Node* node = findNode(directoryPath, 0);
|
||||
if (!node) {
|
||||
gError = "Invalid path";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (node->type != DIRECTORY) {
|
||||
gError = "given path is not a directory";
|
||||
return false;
|
||||
}
|
||||
|
||||
auto directory = ((Directory*) node);
|
||||
|
||||
Node* existingNode = directory->treeSearch(newKey);
|
||||
if (existingNode) {
|
||||
if (existingNode->type == newNode->type) return false; // exit silently
|
||||
gError = "Cant add node";
|
||||
return false;
|
||||
}
|
||||
|
||||
directory->treeInsert(newKey, newNode);
|
||||
updateTreeLinkCount(newNode);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Node* Directory::findNode(const std::vector<Key>& path, ui32 currentDepth) {
|
||||
if (path.size() == currentDepth) {
|
||||
return this;
|
||||
}
|
||||
|
||||
const Key& key = path[currentDepth];
|
||||
Node* node = treeSearch(key);
|
||||
|
||||
if (!node) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
// link on link is not allowed
|
||||
while (true) {
|
||||
switch (node->type) {
|
||||
case Node::FILE:
|
||||
if (currentDepth == path.size() - 1) return node;
|
||||
return nullptr;
|
||||
|
||||
case Node::DIRECTORY:
|
||||
return ((Directory*)node)->findNode(path, ++currentDepth);
|
||||
|
||||
case Node::LINK:
|
||||
node = ((Link*)node)->link;
|
||||
break;
|
||||
|
||||
default:
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Node* Directory::treeSearch(const Key& key) {
|
||||
if (!members) return nullptr;
|
||||
Node* iterator = members;
|
||||
while (iterator) {
|
||||
if (key > iterator->key) {
|
||||
iterator = iterator->right;
|
||||
} else if (key < iterator->key) {
|
||||
iterator = iterator->left;
|
||||
} else {
|
||||
return iterator;
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void Directory::updateTreeLinkCount(Node* node) {
|
||||
// TODO : update all caches all the way up to '/'
|
||||
}
|
||||
|
||||
void Directory::detachNode(Node* node) {
|
||||
// TODO : remove util from avl tree
|
||||
// TODO : update all cache all the way up to the root (due to the links)
|
||||
// TODO : dont relocate nodes (due existing links to the nodes), only change tree pointers
|
||||
}
|
||||
|
||||
// TODO : user avl tree insertion
|
||||
// TODO : check for existing file
|
||||
// TODO : return true if successful (node inserted)
|
||||
// TODO : dont relocate nodes (due existing links to the nodes), only change tree pointers
|
||||
void Directory::treeInsert(const Key& newKey, Node* newNode) {
|
||||
newNode->key = newKey;
|
||||
members = insertUtil(members, newKey, newNode);
|
||||
}
|
||||
|
||||
// recursively returns valid isLeft or isRight child or root
|
||||
Node* Directory::insertUtil(Node* head, const Key& key, Node* aNode) {
|
||||
|
||||
Node* insertedNode;
|
||||
|
||||
if (head == nullptr) {
|
||||
size++;
|
||||
aNode->updateTreeCache();
|
||||
return aNode;
|
||||
} else if (head->key == key) {
|
||||
return head;
|
||||
} else if (key > head->key) {
|
||||
insertedNode = insertUtil(head->right, key, aNode);
|
||||
head->right = insertedNode;
|
||||
insertedNode->parent = head;
|
||||
} else {
|
||||
insertedNode = insertUtil(head->left, key, aNode);
|
||||
head->left = insertedNode;
|
||||
insertedNode->parent = head;
|
||||
}
|
||||
|
||||
// update height
|
||||
head->height = 1 + std::max(getNodeHeight(head->right), getNodeHeight(head->left));
|
||||
|
||||
int balance = int(getNodeHeight(head->right) - getNodeHeight(head->left));
|
||||
|
||||
if (balance > 1) {
|
||||
if (key > head->right->key) {
|
||||
return rotateLeft(head);
|
||||
} else {
|
||||
head->right = rotateRight(head->right);
|
||||
return rotateLeft(head);
|
||||
}
|
||||
} else if (balance < -1) {
|
||||
if (key < head->left->key) {
|
||||
return rotateRight(head);
|
||||
} else {
|
||||
head->left = rotateLeft(head->left);
|
||||
return rotateRight(head);
|
||||
}
|
||||
}
|
||||
|
||||
head->updateTreeCache();
|
||||
|
||||
return head;
|
||||
}
|
||||
|
||||
// returns new head
|
||||
Node* Directory::rotateLeft(Node* pivot) {
|
||||
Node* const head = pivot;
|
||||
Node* const right = pivot->right;
|
||||
Node* const right_left = right->left;
|
||||
Node* const parent = pivot->parent;
|
||||
|
||||
// parents
|
||||
if (right_left) right_left->parent = head;
|
||||
head->parent = right;
|
||||
right->parent = parent;
|
||||
|
||||
// children
|
||||
head->right = right_left;
|
||||
right->left = head;
|
||||
|
||||
// heights
|
||||
head->height = 1 + std::max(getNodeHeight(head->left), getNodeHeight(head->right));
|
||||
right->height = 1 + std::max(getNodeHeight(right->left), getNodeHeight(right->right));
|
||||
|
||||
// cache
|
||||
head->updateTreeCache();
|
||||
right->updateTreeCache();
|
||||
|
||||
return right;
|
||||
}
|
||||
|
||||
Node* Directory::rotateRight(Node* pivot) {
|
||||
Node* const head = pivot;
|
||||
Node* const left = pivot->left;
|
||||
Node* const left_right = left->right;
|
||||
Node* const parent = pivot->parent;
|
||||
|
||||
// parents
|
||||
if (left_right) left_right->parent = head;
|
||||
head->parent = left;
|
||||
left->parent = parent;
|
||||
|
||||
// children
|
||||
head->left = left_right;
|
||||
left->right = head;
|
||||
|
||||
// heights
|
||||
head->height = 1 + std::max(getNodeHeight(head->left), getNodeHeight(head->right));
|
||||
left->height = 1 + std::max(getNodeHeight(left->left), getNodeHeight(left->right));
|
||||
|
||||
// cache
|
||||
head->updateTreeCache();
|
||||
left->updateTreeCache();
|
||||
|
||||
return left;
|
||||
}
|
||||
|
||||
ui32 Directory::getNodeHeight(const Node* node) { return node ? node->height : -1; }
|
||||
|
||||
Node* Directory::maxNode() const {
|
||||
Node* head = members;
|
||||
if (!head) return nullptr;
|
||||
while (head->right != nullptr) {
|
||||
head = head->right;
|
||||
}
|
||||
return head;
|
||||
}
|
||||
|
||||
void Directory::getMaxDepthUtil(ui32 depth, ui32& maxDepth) const {
|
||||
if (!members) return;
|
||||
maxDepth = std::max(depth, maxDepth);
|
||||
traverseInorderUtil(members, [&](Node* node){
|
||||
if (node->type == DIRECTORY) {
|
||||
((Directory*)node)->getMaxDepthUtil(++depth, maxDepth);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
ui32 Directory::getMaxDepth() const {
|
||||
ui32 maxDepth = 1;
|
||||
getMaxDepthUtil(1, maxDepth);
|
||||
return maxDepth;
|
||||
}
|
||||
|
||||
|
||||
FileSystem::FileSystem() {
|
||||
root = new Directory();
|
||||
currentDirectory = root;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue