From 2943e0ddfbba8b5a6caa371bcdec9fa556200134 Mon Sep 17 00:00:00 2001 From: Coder12a <38924418+Coder12a@users.noreply.github.com> Date: Mon, 13 May 2019 14:32:42 -0500 Subject: [PATCH 01/14] Move: desc and depends into conf file --- async.lua | 206 ------------------------------------------------ colddb.lua | 2 +- depends.txt | 1 - description.txt | 1 - init.lua | 1 - mod.conf | 4 +- 6 files changed, 4 insertions(+), 211 deletions(-) delete mode 100644 async.lua delete mode 100644 depends.txt delete mode 100644 description.txt diff --git a/async.lua b/async.lua deleted file mode 100644 index 5f517ec..0000000 --- a/async.lua +++ /dev/null @@ -1,206 +0,0 @@ -if not extended_api then - extended_api = {} -end -if not extended_api.Async then - extended_api.Async = {} -end - -function extended_api.Async() - local self = {} - - self.task_queue = {} - self.resting = 200 - self.maxtime = 200 - self.queue_threads = 8 - self.state = "suspended" - - self.create_worker = function(func) - local thread = coroutine.create(func) - if not thread or coroutine.status(thread) == "dead" then - minetest.after(0.3, self.create_worker, func) - return - end - self.run_worker(thread) - end - - self.create_globalstep_worker = function(func) - local thread = coroutine.create(func) - if not thread or coroutine.status(thread) == "dead" then - minetest.after(0.3, self.create_globalstep_worker, func) - return - end - self.run_globalstep_worker(thread) - end - self.run_worker = function(thread) - if not thread or coroutine.status(thread) == "dead" then - return false - else - coroutine.resume(thread) - minetest.after(self.resting / 1000, self.run_worker, thread) - return true - end - end - - self.run_globalstep_worker = function(thread) - if not thread or coroutine.status(thread) == "dead" then - return false - else - coroutine.resume(thread) - minetest.after(0, self.run_globalstep_worker, thread) - return true - end - end - - self.priority = function(resting, maxtime) - self.resting = resting - self.maxtime = maxtime - end - - self.iterate = function(from, to, func, callback) - self.create_worker(function() - local last_time = minetest.get_us_time() / 1000 - local maxtime = self.maxtime - for i = from, to do - local b = func(i) - if b ~= nil and b == false then - break - end - if minetest.get_us_time() / 1000 > last_time + maxtime then - coroutine.yield() - last_time = minetest.get_us_time() / 1000 - end - end - if callback then - callback() - end - return - end) - end - - self.foreach = function(array, func, callback) - self.create_worker(function() - local last_time = minetest.get_us_time() / 1000 - local maxtime = self.maxtime - for k,v in ipairs(array) do - local b = func(k,v) - if b ~= nil and b == false then - break - end - if minetest.get_us_time() / 1000 > last_time + maxtime then - coroutine.yield() - last_time = minetest.get_us_time() / 1000 - end - end - if callback then - callback() - end - return - end) - end - - self.do_while = function(condition_func, func, callback) - self.create_worker(function() - local last_time = minetest.get_us_time() / 1000 - local maxtime = self.maxtime - while(condition_func()) do - local c = func() - if c ~= nil and c ~= condition_func() then - break - end - if minetest.get_us_time() / 1000 > last_time + maxtime then - coroutine.yield() - last_time = minetest.get_us_time() / 1000 - end - end - if callback then - callback() - end - return - end) - end - - self.register_globalstep = function(func) - self.create_globalstep_worker(function() - local last_time = minetest.get_us_time() / 1000000 - local dtime = last_time - while(true) do - dtime = (minetest.get_us_time() / 1000000) - last_time - func(dtime) - -- 0.05 seconds - if minetest.get_us_time() / 1000000 > last_time + 0.05 then - coroutine.yield() - last_time = minetest.get_us_time() / 1000000 - end - end - end) - end - - self.chain_task = function(tasks, callback) - self.create_worker(function() - local pass_arg = nil - local last_time = minetest.get_us_time() / 1000 - local maxtime = self.maxtime - for index, task_func in pairs(tasks) do - local p = task_func(pass_arg) - if p ~= nil then - pass_arg = p - end - if minetest.get_us_time() / 1000 > last_time + maxtime then - coroutine.yield() - last_time = minetest.get_us_time() / 1000 - end - end - if callback then - callback(pass_arg) - end - return - end) - end - - self.queue_task = function(func, callback) - table.insert(self.task_queue, {func = func,callback = callback}) - if self.queue_threads > 0 then - self.queue_threads = self.queue_threads - 1 - self.create_worker(function() - local pass_arg = nil - local last_time = minetest.get_us_time() / 1000 - local maxtime = self.maxtime - while(true) do - local task_func = self.task_queue[1] - table.remove(self.task_queue, 1) - if task_func and task_func.func then - pass_arg = nil - local p = task_func.func() - if p ~= nil then - pass_arg = p - end - if task_func.callback then - task_func.callback(pass_arg) - end - if minetest.get_us_time() / 1000 > last_time + maxtime then - coroutine.yield() - last_time = minetest.get_us_time() / 1000 - end - else - self.queue_threads = self.queue_threads + 1 - return - end - end - end) - end - end - - self.single_task = function(func, callback) - self.create_worker(function() - local pass_arg = func() - if p ~= nil then - pass_arg = p - end - if task_func.callback then - task_func.callback(pass_arg) - end - return - end) - end - return self -end diff --git a/colddb.lua b/colddb.lua index 934bf53..421eb31 100644 --- a/colddb.lua +++ b/colddb.lua @@ -11,7 +11,7 @@ function colddb.Colddb(dir) local mem_pool = {} local mem_pool_del = {} local add_to_mem_pool = true - local async = extended_api.Async() + local async = async.Async() async.priority(150, 250) diff --git a/depends.txt b/depends.txt deleted file mode 100644 index 7221d40..0000000 --- a/depends.txt +++ /dev/null @@ -1 +0,0 @@ -extended_api? \ No newline at end of file diff --git a/description.txt b/description.txt deleted file mode 100644 index 542d095..0000000 --- a/description.txt +++ /dev/null @@ -1 +0,0 @@ -pure lua No-sql Asynchronous database mod. \ No newline at end of file diff --git a/init.lua b/init.lua index 12c4b0a..80f361b 100644 --- a/init.lua +++ b/init.lua @@ -1,4 +1,3 @@ modpath = minetest.get_modpath("colddb") -dofile(string.format("%s/async.lua", modpath)) dofile(string.format("%s/colddb.lua", modpath)) diff --git a/mod.conf b/mod.conf index 6c7c4a7..77ded5f 100644 --- a/mod.conf +++ b/mod.conf @@ -1 +1,3 @@ -name = colddb \ No newline at end of file +name = colddb +description = pure lua No-sql Asynchronous database mod. +depends = async From ca249eef3a971b54f25cb4e82b71088a562b0a6d Mon Sep 17 00:00:00 2001 From: Coder12a <38924418+Coder12a@users.noreply.github.com> Date: Mon, 13 May 2019 14:35:10 -0500 Subject: [PATCH 02/14] Update: readme file --- README.md | 66 ------------------------------------------------------- 1 file changed, 66 deletions(-) diff --git a/README.md b/README.md index c949a2e..59d57a1 100644 --- a/README.md +++ b/README.md @@ -44,72 +44,6 @@ coldbase.remove("MyKeyAndValue") ```lua coldbase.add_to_mem_pool = true ``` -7. returns the amount of entries from the entry file. -```lua -coldbase.get_entry_file_count(name, tag_name) -``` -8. iterates through the entry file(breaks and ends if it reaches the end of the file). -```lua -coldbase.iterate_entry_file(name, begin_func, func_on_iterate, end_func, args, tag_name) -``` -9. adds a folder which can be used in other functions that have tag_name arg. -```lua -coldbase.add_tag("Extra_Folder", {"Extra", "Folder"}) -``` -10. returns the tag name if the tag does not exists it creates one. -```lua -coldbase.get_or_add_tag("Extra_Folder", {"Extra", "Folder"}, no_new_path) -``` -11. remove tag by name. -```lua -coldbase.remove_tag("Extra_Folder") -``` - -Quick Look -=========== - -```lua --- create an directory(watchlist) and link it as a database. -ip_db = colddb.Colddb("watchlist") - --- When ever a player join's his/her ip address is recorded to the database by player name. -minetest.register_on_prejoinplayer(function(name, ip) - ip_db.set(name, ip, ip_db.get_or_add_tag("ips", "ips")) -end) - -minetest.register_chatcommand("ip", { - params = "", - description = "Get an player's ip address.", - func = function(name, param) - -- Get the ip record asynchronously. - ip_db.get(param, ip_db.get_or_add_tag("ips", "ips"), function(record) - -- If record is contains data send it to the player. - if record then - minetest.chat_send_player(name, string.format("%s:%s", param, record)) - else - -- No record was found. - minetest.chat_send_player(name, "Can not find ip record.") - end - end) - end -}) - -minetest.register_chatcommand("clear", { - params = "", - description = "Clear out the ip database.", - func = function(name, param) - ip_db.remove_tag(ip_db.get_or_add_tag("ips", "ips")) - minetest.chat_send_player(name, "Ip Database Cleared!") - end -}) - -``` - -Quick Look Notes -=========== - -In the example above we could also create a more complex ip database using tags. Creating tags named after the player then assigning the ip files to them.
-This way we could store many ips associated with the player instead of just one ip. License =========== From 81bbc51deed6b8db0774701095c9d7156f14761b Mon Sep 17 00:00:00 2001 From: Coder12a <38924418+Coder12a@users.noreply.github.com> Date: Thu, 16 May 2019 20:07:27 -0500 Subject: [PATCH 03/14] Re-license: mod under MIT --- LICENSE | 529 +++----------------------------------------------------- 1 file changed, 21 insertions(+), 508 deletions(-) diff --git a/LICENSE b/LICENSE index 3cba0cc..315f675 100644 --- a/LICENSE +++ b/LICENSE @@ -1,508 +1,21 @@ -Based on FlatDB(MIT) ---------------------------- -Copyright (C) 2018 Coder12a - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random - Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! \ No newline at end of file +MIT License + +Copyright (c) 2019 Coder12a + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 19b6648d69578ab7f0853ee514568ade6759bb75 Mon Sep 17 00:00:00 2001 From: Coder12a <38924418+Coder12a@users.noreply.github.com> Date: Sun, 19 May 2019 22:19:20 -0500 Subject: [PATCH 04/14] Add: use_async function --- colddb.lua | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/colddb.lua b/colddb.lua index 421eb31..a6cf88f 100644 --- a/colddb.lua +++ b/colddb.lua @@ -12,6 +12,7 @@ function colddb.Colddb(dir) local mem_pool_del = {} local add_to_mem_pool = true local async = async.Async() + local use_async = true async.priority(150, 250) @@ -52,6 +53,10 @@ function colddb.Colddb(dir) end return add_to_mem_pool end + + self.use_async = function(value) + use_async = value + end local function file_exists(name) local f = io.open(string.format("%s/%s.cold", directory, name), "r") @@ -79,7 +84,7 @@ function colddb.Colddb(dir) local err, msg = os.remove(text) if err == nil then - print(string.format("error removing db data %s error message: %s", text, msg)) + minetest.log(string.format("error removing db data %s error message: %s", text, msg)) end end @@ -117,11 +122,17 @@ function colddb.Colddb(dir) end self.save_mem = function(name) - async.queue_task(function() + if use_async then + async.queue_task(function() + if mem_pool[name] ~= nil then + save_table(name, mem_pool[name].mem) + end + end) + else if mem_pool[name] ~= nil then save_table(name, mem_pool[name].mem) end - end) + end mem_pool_del[name] = nil end @@ -132,9 +143,14 @@ function colddb.Colddb(dir) end self.set = function(name, _table) - async.queue_task(function() + if use_async then + async.queue_task(function() + save_table(name, _table) + end) + else save_table(name, _table) - end) + end + if add_to_mem_pool then load_into_mem(name, _table) end @@ -143,9 +159,14 @@ function colddb.Colddb(dir) end self.set_key = function(name) - async.queue_task(function() + if use_async then + async.queue_task(function() + save_key(name) + end) + else save_key(name) - end) + end + if add_to_mem_pool then load_into_mem(name, "") end @@ -231,9 +252,14 @@ function colddb.Colddb(dir) self.remove = function(name) mem_pool[name] = nil mem_pool_del[name] = true - async.queue_task(function() + + if use_async then + async.queue_task(function() + delete_file(name) + end) + else delete_file(name) - end) + end end return self From e953987c9c6d3eadd8c1404e2e7bb957998ae1f6 Mon Sep 17 00:00:00 2001 From: Coder12a <38924418+Coder12a@users.noreply.github.com> Date: Sun, 19 May 2019 22:21:21 -0500 Subject: [PATCH 05/14] Never: write nil to file --- colddb.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/colddb.lua b/colddb.lua index a6cf88f..593a93e 100644 --- a/colddb.lua +++ b/colddb.lua @@ -100,6 +100,9 @@ function colddb.Colddb(dir) local function save_table(name, _table) minetest.log(string.format("%s/%s.cold", directory, name)) + if save_table == nil or name == nil then + return false + end return minetest.safe_file_write(string.format("%s/%s.cold", directory, name), minetest.serialize(_table)) end From 63cfeb4cb9000c2bcc1c793bd30e31d3e4e31f07 Mon Sep 17 00:00:00 2001 From: Coder12a <38924418+Coder12a@users.noreply.github.com> Date: Sun, 19 May 2019 23:55:05 -0500 Subject: [PATCH 06/14] Add: sub_database function --- colddb.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/colddb.lua b/colddb.lua index 593a93e..29e657c 100644 --- a/colddb.lua +++ b/colddb.lua @@ -264,6 +264,12 @@ function colddb.Colddb(dir) delete_file(name) end end + + self.sub_database = function(path) + local db = colddb.Colddb(dir .. "/" .. path) + db.set_async(async) + return db + end return self end From 8395ee0d41131e8d532e8a5f60df88918818eba0 Mon Sep 17 00:00:00 2001 From: Coder12a <38924418+Coder12a@users.noreply.github.com> Date: Mon, 20 May 2019 00:02:43 -0500 Subject: [PATCH 07/14] Add: functions to_array, to_table, iterate --- colddb.lua | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/colddb.lua b/colddb.lua index 29e657c..8fc79ce 100644 --- a/colddb.lua +++ b/colddb.lua @@ -270,6 +270,36 @@ function colddb.Colddb(dir) db.set_async(async) return db end + + self.to_array = function() + local entries = {} + + for k, v in pairs(minetest.get_dir_list(directory)) do + entries[#entries + 1] = v:sub(0, v:len() - 5) + end + + return entries + end + + self.to_table = function() + local entries = {} + + for k, v in pairs(minetest.get_dir_list(directory)) do + entries[v:sub(0, v:len() - 5)] = true + end + + return entries + end + + self.iterate = function() + local entries = {} + + for k, v in pairs(minetest.get_dir_list(directory)) do + entries[v:sub(0, v:len() - 5)] = true + end + + return pairs(entries) + end return self end From a17618bdb032aae79edb89e204768ad9d96a95ea Mon Sep 17 00:00:00 2001 From: Coder12a <38924418+Coder12a@users.noreply.github.com> Date: Mon, 20 May 2019 12:31:55 -0500 Subject: [PATCH 08/14] Update: license notice in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 59d57a1..cb81483 100644 --- a/README.md +++ b/README.md @@ -48,4 +48,4 @@ coldbase.add_to_mem_pool = true License =========== -ColdDB is distributed under the LGPLv2.1+ license. \ No newline at end of file +ColdDB is distributed under the MIT license. \ No newline at end of file From d8956246891731e94a5847966841abc77a7b29ca Mon Sep 17 00:00:00 2001 From: Coder12a <38924418+Coder12a@users.noreply.github.com> Date: Tue, 21 May 2019 12:27:04 -0500 Subject: [PATCH 09/14] Only: iterate file names --- colddb.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/colddb.lua b/colddb.lua index 8fc79ce..24fdb41 100644 --- a/colddb.lua +++ b/colddb.lua @@ -274,7 +274,7 @@ function colddb.Colddb(dir) self.to_array = function() local entries = {} - for k, v in pairs(minetest.get_dir_list(directory)) do + for k, v in pairs(minetest.get_dir_list(directory, false)) do entries[#entries + 1] = v:sub(0, v:len() - 5) end @@ -284,7 +284,7 @@ function colddb.Colddb(dir) self.to_table = function() local entries = {} - for k, v in pairs(minetest.get_dir_list(directory)) do + for k, v in pairs(minetest.get_dir_list(directory, false)) do entries[v:sub(0, v:len() - 5)] = true end @@ -294,7 +294,7 @@ function colddb.Colddb(dir) self.iterate = function() local entries = {} - for k, v in pairs(minetest.get_dir_list(directory)) do + for k, v in pairs(minetest.get_dir_list(directory, false)) do entries[v:sub(0, v:len() - 5)] = true end From e70923c8fcddc38dad8f188a0a5a700ce257ca08 Mon Sep 17 00:00:00 2001 From: Coder12a <38924418+Coder12a@users.noreply.github.com> Date: Thu, 23 May 2019 10:22:53 -0500 Subject: [PATCH 10/14] Add: serializer_type --- colddb.lua | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/colddb.lua b/colddb.lua index 24fdb41..a772847 100644 --- a/colddb.lua +++ b/colddb.lua @@ -1,5 +1,8 @@ colddb = {} +colddb.serializers = {} +colddb.serializers.default = 0 + function colddb.Colddb(dir) if not minetest.mkdir(dir) then error(string.format("%s is not a directory.", dir)) @@ -13,6 +16,9 @@ function colddb.Colddb(dir) local add_to_mem_pool = true local async = async.Async() local use_async = true + local serializer = minetest.serialize + local deserializer = minetest.deserialize + local serializer_type = colddb.serializers.default async.priority(150, 250) @@ -58,6 +64,18 @@ function colddb.Colddb(dir) use_async = value end + self.get_serializer_type = function(value) + return serializer_type + end + + self.set_serializer_type = function(value) + serializer_type = value + if serializer_type == colddb.serializers.default then + serializer = minetest.serialize + deserializer = minetest.deserialize + end + end + local function file_exists(name) local f = io.open(string.format("%s/%s.cold", directory, name), "r") if f ~= nil then @@ -91,7 +109,7 @@ function colddb.Colddb(dir) local function load_table(name) local f = io.open(string.format("%s/%s.cold", directory, name), "r") if f then - local data = minetest.deserialize(f:read("*a")) + local data = deserializer(f:read("*a")) f:close() return data end From b7a1c9fcc4ed083dcf482d375b599cbed443c7a0 Mon Sep 17 00:00:00 2001 From: Coder12a <38924418+Coder12a@users.noreply.github.com> Date: Thu, 23 May 2019 10:26:30 -0500 Subject: [PATCH 11/14] Add: get and set serializer function --- colddb.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/colddb.lua b/colddb.lua index a772847..f3f198d 100644 --- a/colddb.lua +++ b/colddb.lua @@ -64,7 +64,7 @@ function colddb.Colddb(dir) use_async = value end - self.get_serializer_type = function(value) + self.get_serializer_type = function() return serializer_type end @@ -75,6 +75,10 @@ function colddb.Colddb(dir) deserializer = minetest.deserialize end end + + self.get_serializer = function() + return serializer, deserializer + end local function file_exists(name) local f = io.open(string.format("%s/%s.cold", directory, name), "r") From 94b62ac5abb627be5c7e8fd1b253ecf8db761464 Mon Sep 17 00:00:00 2001 From: Coder12a <38924418+Coder12a@users.noreply.github.com> Date: Thu, 23 May 2019 10:27:02 -0500 Subject: [PATCH 12/14] Merge: down later --- colddb.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/colddb.lua b/colddb.lua index f3f198d..7aaba5a 100644 --- a/colddb.lua +++ b/colddb.lua @@ -79,6 +79,11 @@ function colddb.Colddb(dir) self.get_serializer = function() return serializer, deserializer end + + self.set_serializer = function(coder, decoder) + serializer = coder + deserializer = decoder + end local function file_exists(name) local f = io.open(string.format("%s/%s.cold", directory, name), "r") From ed7b5996a719ce575f6aa0eebf18bba1725faac2 Mon Sep 17 00:00:00 2001 From: Coder12a <38924418+Coder12a@users.noreply.github.com> Date: Tue, 15 Oct 2019 11:11:51 -0500 Subject: [PATCH 13/14] Remove: use_async --- colddb.lua | 46 +++++----------------------------------------- 1 file changed, 5 insertions(+), 41 deletions(-) diff --git a/colddb.lua b/colddb.lua index 7aaba5a..da3f830 100644 --- a/colddb.lua +++ b/colddb.lua @@ -15,7 +15,6 @@ function colddb.Colddb(dir) local mem_pool_del = {} local add_to_mem_pool = true local async = async.Async() - local use_async = true local serializer = minetest.serialize local deserializer = minetest.deserialize local serializer_type = colddb.serializers.default @@ -60,10 +59,6 @@ function colddb.Colddb(dir) return add_to_mem_pool end - self.use_async = function(value) - use_async = value - end - self.get_serializer_type = function() return serializer_type end @@ -152,18 +147,9 @@ function colddb.Colddb(dir) end self.save_mem = function(name) - if use_async then - async.queue_task(function() - if mem_pool[name] ~= nil then - save_table(name, mem_pool[name].mem) - end - end) - else - if mem_pool[name] ~= nil then - save_table(name, mem_pool[name].mem) - end + if mem_pool[name] ~= nil then + save_table(name, mem_pool[name].mem) end - mem_pool_del[name] = nil end @@ -173,30 +159,15 @@ function colddb.Colddb(dir) end self.set = function(name, _table) - if use_async then - async.queue_task(function() - save_table(name, _table) - end) - else - save_table(name, _table) - end - + save_table(name, _table) if add_to_mem_pool then load_into_mem(name, _table) end - mem_pool_del[name] = nil end self.set_key = function(name) - if use_async then - async.queue_task(function() - save_key(name) - end) - else - save_key(name) - end - + save_key(name) if add_to_mem_pool then load_into_mem(name, "") end @@ -282,14 +253,7 @@ function colddb.Colddb(dir) self.remove = function(name) mem_pool[name] = nil mem_pool_del[name] = true - - if use_async then - async.queue_task(function() - delete_file(name) - end) - else - delete_file(name) - end + delete_file(name) end self.sub_database = function(path) From 5a9a9975a9a415ffe892ce7f667cefecc494b733 Mon Sep 17 00:00:00 2001 From: Coder12a <38924418+Coder12a@users.noreply.github.com> Date: Tue, 15 Oct 2019 11:14:31 -0500 Subject: [PATCH 14/14] Remove: .cold file ext --- README.md | 2 ++ colddb.lua | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cb81483..2235c22 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ ColdDB ColdDB is a minetest mod that implements a serverless, asynchronous, NoSQL database engine.
It provides a key or key-value based storage system using plain Lua tables.
+.cold file ext was removed. + Usage =========== diff --git a/colddb.lua b/colddb.lua index da3f830..4530d24 100644 --- a/colddb.lua +++ b/colddb.lua @@ -81,7 +81,7 @@ function colddb.Colddb(dir) end local function file_exists(name) - local f = io.open(string.format("%s/%s.cold", directory, name), "r") + local f = io.open(string.format("%s/%s", directory, name), "r") if f ~= nil then io.close(f) return true