From d775ff1d0a72c0533ce1f1c30af762789d401b98 Mon Sep 17 00:00:00 2001 From: MrBounty Date: Sat, 11 Jan 2025 23:41:03 +0100 Subject: [PATCH] Deleted stuffs dir for a dataStructure one --- .../RadixTrie.zig.old | 0 .../UUIDFileIndex.zig | 0 .../additionalData.zig | 2 +- src/dataStructure/fileVar.zig | 31 +++++++++++++++++++ src/{stuffs => dataStructure}/filter.zig | 2 +- src/{stuffs => dataStructure}/relationMap.zig | 2 +- src/entityWriter.zig | 8 ++--- src/{stuffs => }/errors.zig | 0 src/fileEngine.zig | 16 +++++----- src/main.zig | 4 +-- src/schemaEngine.zig | 12 +++---- src/schemaParser.zig | 6 ++-- src/threadEngine.zig | 2 +- src/{stuffs => }/utils.zig | 0 src/ziqlParser.zig | 18 +++++------ 15 files changed, 67 insertions(+), 36 deletions(-) rename src/{stuffs => dataStructure}/RadixTrie.zig.old (100%) rename src/{stuffs => dataStructure}/UUIDFileIndex.zig (100%) rename src/{stuffs => dataStructure}/additionalData.zig (96%) create mode 100644 src/dataStructure/fileVar.zig rename src/{stuffs => dataStructure}/filter.zig (99%) rename src/{stuffs => dataStructure}/relationMap.zig (98%) rename src/{stuffs => }/errors.zig (100%) rename src/{stuffs => }/utils.zig (100%) diff --git a/src/stuffs/RadixTrie.zig.old b/src/dataStructure/RadixTrie.zig.old similarity index 100% rename from src/stuffs/RadixTrie.zig.old rename to src/dataStructure/RadixTrie.zig.old diff --git a/src/stuffs/UUIDFileIndex.zig b/src/dataStructure/UUIDFileIndex.zig similarity index 100% rename from src/stuffs/UUIDFileIndex.zig rename to src/dataStructure/UUIDFileIndex.zig diff --git a/src/stuffs/additionalData.zig b/src/dataStructure/additionalData.zig similarity index 96% rename from src/stuffs/additionalData.zig rename to src/dataStructure/additionalData.zig index 045fb21..724a857 100644 --- a/src/stuffs/additionalData.zig +++ b/src/dataStructure/additionalData.zig @@ -6,7 +6,7 @@ const DataType = dtype.DataType; // TODO: Put this in a data structure directory -const ZipponError = @import("errors.zig").ZipponError; +const ZipponError = @import("../errors.zig").ZipponError; /// This is the [] part pub const AdditionalData = @This(); diff --git a/src/dataStructure/fileVar.zig b/src/dataStructure/fileVar.zig new file mode 100644 index 0000000..3d245c7 --- /dev/null +++ b/src/dataStructure/fileVar.zig @@ -0,0 +1,31 @@ +// For when I move to a single file +// How I see it is that I have some kind of fileVar that keep a position and type +// When I want to read the value, I read the file then convert it back +// I can do something similar but with a chunck of data after +// Like a start position and size, like memory but for file +// The point being giving more size when I modify thing to prevent rewritting everything + +const std = @import("std"); +const zid = @import("ZipponData"); + +pub fn fileVar(comptime T: type) type { + return struct { + const Self = @This(); + + position: usize, + file: *std.fs.File, + T: type = T, + + pub fn init(position: usize, file: *std.fs.File) Self { + return .{ + .position = position, + .file = file, + }; + } + + pub fn read(self: Self) !T { + try self.file.seekTo(self.position); + self.file.reader().readBytesNoEof(@sizeOf(T)); + } + }; +} diff --git a/src/stuffs/filter.zig b/src/dataStructure/filter.zig similarity index 99% rename from src/stuffs/filter.zig rename to src/dataStructure/filter.zig index a3e396f..085d6d3 100644 --- a/src/stuffs/filter.zig +++ b/src/dataStructure/filter.zig @@ -10,7 +10,7 @@ const std = @import("std"); const s2t = @import("dtype").s2t; -const ZipponError = @import("errors.zig").ZipponError; +const ZipponError = @import("../errors.zig").ZipponError; const DataType = @import("dtype").DataType; const DateTime = @import("dtype").DateTime; const UUID = @import("dtype").UUID; diff --git a/src/stuffs/relationMap.zig b/src/dataStructure/relationMap.zig similarity index 98% rename from src/stuffs/relationMap.zig rename to src/dataStructure/relationMap.zig index 99144c3..64fb6c7 100644 --- a/src/stuffs/relationMap.zig +++ b/src/dataStructure/relationMap.zig @@ -21,7 +21,7 @@ const std = @import("std"); const AdditionalData = @import("additionalData.zig").AdditionalData; -const ZipponError = @import("errors.zig").ZipponError; +const ZipponError = @import("../errors.zig").ZipponError; pub const JsonString = struct { slice: []const u8 = "", diff --git a/src/entityWriter.zig b/src/entityWriter.zig index 5cf6cb5..7c7fb04 100644 --- a/src/entityWriter.zig +++ b/src/entityWriter.zig @@ -1,14 +1,14 @@ const std = @import("std"); -const utils = @import("stuffs/utils.zig"); +const utils = @import("utils.zig"); const zid = @import("ZipponData"); -const AdditionalData = @import("stuffs/additionalData.zig").AdditionalData; -const JsonString = @import("stuffs/relationMap.zig").JsonString; +const AdditionalData = @import("dataStructure/additionalData.zig").AdditionalData; +const JsonString = @import("dataStructure/relationMap.zig").JsonString; const dtype = @import("dtype"); const DataType = dtype.DataType; const DateTime = dtype.DateTime; const UUID = dtype.UUID; -const ZipponError = @import("stuffs/errors.zig").ZipponError; +const ZipponError = @import("errors.zig").ZipponError; pub const EntityWriter = struct { pub fn writeEntityTable( diff --git a/src/stuffs/errors.zig b/src/errors.zig similarity index 100% rename from src/stuffs/errors.zig rename to src/errors.zig diff --git a/src/fileEngine.zig b/src/fileEngine.zig index a311be9..738f29b 100644 --- a/src/fileEngine.zig +++ b/src/fileEngine.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const utils = @import("stuffs/utils.zig"); +const utils = @import("utils.zig"); const zid = @import("ZipponData"); const U64 = std.atomic.Value(u64); const Pool = std.Thread.Pool; @@ -15,13 +15,13 @@ const UUID = dtype.UUID; const DateTime = dtype.DateTime; const DataType = dtype.DataType; -const AdditionalData = @import("stuffs/additionalData.zig").AdditionalData; -const Filter = @import("stuffs/filter.zig").Filter; -const RelationMap = @import("stuffs/relationMap.zig").RelationMap; -const JsonString = @import("stuffs/relationMap.zig").JsonString; -const ConditionValue = @import("stuffs/filter.zig").ConditionValue; +const AdditionalData = @import("dataStructure/additionalData.zig").AdditionalData; +const Filter = @import("dataStructure/filter.zig").Filter; +const RelationMap = @import("dataStructure/relationMap.zig").RelationMap; +const JsonString = @import("dataStructure/relationMap.zig").JsonString; +const ConditionValue = @import("dataStructure/filter.zig").ConditionValue; -const ZipponError = @import("stuffs/errors.zig").ZipponError; +const ZipponError = @import("errors.zig").ZipponError; const config = @import("config"); const BUFFER_SIZE = config.BUFFER_SIZE; @@ -184,7 +184,7 @@ pub fn getNumberOfEntity(self: *FileEngine, struct_name: []const u8) ZipponError return count; } -const UUIDFileIndex = @import("stuffs/UUIDFileIndex.zig").UUIDIndexMap; +const UUIDFileIndex = @import("dataStructure/UUIDFileIndex.zig").UUIDIndexMap; /// Populate a map with all UUID bytes as key and file index as value /// This map is store in the SchemaStruct to then by using a list of UUID, get a list of file_index to parse diff --git a/src/main.zig b/src/main.zig index c36723f..ff59783 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const utils = @import("stuffs/utils.zig"); +const utils = @import("utils.zig"); const send = utils.send; const Allocator = std.mem.Allocator; const Pool = std.Thread.Pool; @@ -15,7 +15,7 @@ const ziqlTokenizer = @import("tokenizers/ziql.zig").Tokenizer; const ziqlToken = @import("tokenizers/ziql.zig").Token; const ziqlParser = @import("ziqlParser.zig").Parser; -const ZipponError = @import("stuffs/errors.zig").ZipponError; +const ZipponError = @import("errors.zig").ZipponError; const config = @import("config"); const BUFFER_SIZE = config.BUFFER_SIZE; diff --git a/src/schemaEngine.zig b/src/schemaEngine.zig index 7205ab1..62127bd 100644 --- a/src/schemaEngine.zig +++ b/src/schemaEngine.zig @@ -3,15 +3,15 @@ const zid = @import("ZipponData"); const Allocator = std.mem.Allocator; const Parser = @import("schemaParser.zig").Parser; const Tokenizer = @import("tokenizers/schema.zig").Tokenizer; -const ZipponError = @import("stuffs/errors.zig").ZipponError; +const ZipponError = @import("errors.zig").ZipponError; const dtype = @import("dtype"); const DataType = dtype.DataType; -const AdditionalData = @import("stuffs/additionalData.zig").AdditionalData; -const RelationMap = @import("stuffs/relationMap.zig").RelationMap; -const JsonString = @import("stuffs/relationMap.zig").JsonString; -const ConditionValue = @import("stuffs/filter.zig").ConditionValue; +const AdditionalData = @import("dataStructure/additionalData.zig").AdditionalData; +const RelationMap = @import("dataStructure/relationMap.zig").RelationMap; +const JsonString = @import("dataStructure/relationMap.zig").JsonString; +const ConditionValue = @import("dataStructure/filter.zig").ConditionValue; const UUID = dtype.UUID; -const UUIDFileIndex = @import("stuffs/UUIDFileIndex.zig").UUIDIndexMap; +const UUIDFileIndex = @import("dataStructure/UUIDFileIndex.zig").UUIDIndexMap; const FileEngine = @import("fileEngine.zig").FileEngine; // TODO: Create a schemaEngine directory and add this as core and the parser with it diff --git a/src/schemaParser.zig b/src/schemaParser.zig index 85b4f99..e9974d8 100644 --- a/src/schemaParser.zig +++ b/src/schemaParser.zig @@ -7,10 +7,10 @@ const UUID = @import("dtype").UUID; const Toker = @import("tokenizers/schema.zig").Tokenizer; const Token = @import("tokenizers/schema.zig").Token; const Loc = @import("tokenizers/shared/loc.zig").Loc; -const send = @import("stuffs/utils.zig").send; -const printError = @import("stuffs/utils.zig").printError; +const send = @import("utils.zig").send; +const printError = @import("utils.zig").printError; -const SchemaParserError = @import("stuffs/errors.zig").SchemaParserError; +const SchemaParserError = @import("errors.zig").SchemaParserError; const State = enum { end, diff --git a/src/threadEngine.zig b/src/threadEngine.zig index a4f3921..e9ea2a9 100644 --- a/src/threadEngine.zig +++ b/src/threadEngine.zig @@ -5,7 +5,7 @@ const U64 = std.atomic.Value(u64); const Pool = std.Thread.Pool; const Allocator = std.mem.Allocator; -const ZipponError = @import("stuffs/errors.zig").ZipponError; +const ZipponError = @import("errors.zig").ZipponError; const CPU_CORE = @import("config").CPU_CORE; const OUT_BUFFER_SIZE = @import("config").OUT_BUFFER_SIZE; const log = std.log.scoped(.thread); diff --git a/src/stuffs/utils.zig b/src/utils.zig similarity index 100% rename from src/stuffs/utils.zig rename to src/utils.zig diff --git a/src/ziqlParser.zig b/src/ziqlParser.zig index b0db00c..509742d 100644 --- a/src/ziqlParser.zig +++ b/src/ziqlParser.zig @@ -8,17 +8,17 @@ const Token = @import("tokenizers/ziql.zig").Token; const dtype = @import("dtype"); const UUID = dtype.UUID; -const Filter = @import("stuffs/filter.zig").Filter; -const Condition = @import("stuffs/filter.zig").Condition; -const ConditionValue = @import("stuffs/filter.zig").ConditionValue; -const ComparisonOperator = @import("stuffs/filter.zig").ComparisonOperator; +const Filter = @import("dataStructure/filter.zig").Filter; +const Condition = @import("dataStructure/filter.zig").Condition; +const ConditionValue = @import("dataStructure/filter.zig").ConditionValue; +const ComparisonOperator = @import("dataStructure/filter.zig").ComparisonOperator; -const AdditionalData = @import("stuffs/additionalData.zig").AdditionalData; -const AdditionalDataMember = @import("stuffs/additionalData.zig").AdditionalDataMember; -const send = @import("stuffs/utils.zig").send; -const printError = @import("stuffs/utils.zig").printError; +const AdditionalData = @import("dataStructure/additionalData.zig").AdditionalData; +const AdditionalDataMember = @import("dataStructure/additionalData.zig").AdditionalDataMember; +const send = @import("utils.zig").send; +const printError = @import("utils.zig").printError; -const ZipponError = @import("stuffs/errors.zig").ZipponError; +const ZipponError = @import("errors.zig").ZipponError; const PRINT_STATE = @import("config").PRINT_STATE; const log = std.log.scoped(.ziqlParser);