Merge pull request #16 from ao/develop

Develop
ao · Nov 2, 2021 · 279e9a8 · 279e9a8
2 parents a2710f4 + b6dbb9a
commit 279e9a8
Show file tree

Hide file tree

Showing 28 changed files with 98 additions and 112 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:8
-COPY ./target/Serengeti-1.2-SNAPSHOT-jar-with-dependencies.jar /tmp
+COPY ./target/Serengeti-1.3-SNAPSHOT-jar-with-dependencies.jar /tmp
 WORKDIR /tmp
 EXPOSE 1985
-#ENTRYPOINT ["java","gl.ao.serengeti.Serengeti"]
-CMD java -jar Serengeti-1.2-SNAPSHOT-jar-with-dependencies.jar
+#ENTRYPOINT ["java","Serengeti"]
+CMD java -jar Serengeti-1.3-SNAPSHOT-jar-with-dependencies.jar
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ Yes, of course you can!
 
 `+ Application`
 
-Set the `classpath` to `Serengeti` and the `Main class` to `gl.ao.serengeti.Serengeti`
+Set the `classpath` to `Serengeti` and the `Main class` to `Serengeti`
 
 `Run the application!`
 

diff --git a/pom.xml b/pom.xml
@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>gl.ao.serengeti</groupId>
+    <groupId>ms.ao.serengeti</groupId>
     <artifactId>Serengeti</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
 
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
@@ -35,7 +35,7 @@
 <!--                        <manifest>-->
 <!--                            <addClasspath>true</addClasspath>-->
 <!--                            <classpathPrefix>lib/</classpathPrefix>-->
-<!--                            <mainClass>gl.ao.serengeti.Serengeti</mainClass>-->
+<!--                            <mainClass>Serengeti</mainClass>-->
 <!--                        </manifest>-->
 <!--                    </archive>-->
 <!--                </configuration>-->
@@ -47,7 +47,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>gl.ao.serengeti.Serengeti</mainClass>
+                            <mainClass>ms.ao.serengeti.Serengeti</mainClass>
                         </manifest>
                     </archive>
                     <descriptorRefs>

diff --git a/src/main/java/gl/ao/serengeti/Serengeti.java → src/main/java/ms/ao/serengeti/Serengeti.java b/src/main/java/gl/ao/serengeti/Serengeti.java → src/main/java/ms/ao/serengeti/Serengeti.java
@@ -1,13 +1,13 @@
-package gl.ao.serengeti;
+package ms.ao.serengeti;
 
-import gl.ao.serengeti.helpers.Globals;
-import gl.ao.serengeti.helpers.ShutdownHandler;
-import gl.ao.serengeti.network.Network;
-import gl.ao.serengeti.server.Server;
-import gl.ao.serengeti.storage.Storage;
-import gl.ao.serengeti.storage.StorageReshuffle;
-import gl.ao.serengeti.storage.StorageScheduler;
-import gl.ao.serengeti.ui.Interactive;
+import ms.ao.serengeti.helpers.Globals;
+import ms.ao.serengeti.helpers.ShutdownHandler;
+import ms.ao.serengeti.network.Network;
+import ms.ao.serengeti.server.Server;
+import ms.ao.serengeti.storage.Storage;
+import ms.ao.serengeti.storage.StorageReshuffle;
+import ms.ao.serengeti.storage.StorageScheduler;
+import ms.ao.serengeti.ui.Interactive;
 
 import java.io.BufferedReader;
 import java.io.InputStream;

diff --git a/...ao/serengeti/data/DatabaseObjectData.java → ...ao/serengeti/data/DatabaseObjectData.java b/...ao/serengeti/data/DatabaseObjectData.java → ...ao/serengeti/data/DatabaseObjectData.java
@@ -1,4 +1,4 @@
-package gl.ao.serengeti.data;
+package ms.ao.serengeti.data;
 
 public class DatabaseObjectData {
 

diff --git a/.../helpers/AppendingObjectOutputStream.java → .../helpers/AppendingObjectOutputStream.java b/.../helpers/AppendingObjectOutputStream.java → .../helpers/AppendingObjectOutputStream.java
@@ -1,4 +1,4 @@
-package gl.ao.serengeti.helpers;
+package ms.ao.serengeti.helpers;
 
 import java.io.IOException;
 import java.io.ObjectOutputStream;

diff --git a/...java/gl/ao/serengeti/helpers/Globals.java → ...java/ms/ao/serengeti/helpers/Globals.java b/...java/gl/ao/serengeti/helpers/Globals.java → ...java/ms/ao/serengeti/helpers/Globals.java
@@ -1,6 +1,6 @@
-package gl.ao.serengeti.helpers;
+package ms.ao.serengeti.helpers;
 
-import gl.ao.serengeti.Serengeti;
+import ms.ao.serengeti.Serengeti;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/.../gl/ao/serengeti/helpers/GlobalsTest.java → .../ms/ao/serengeti/helpers/GlobalsTest.java b/.../gl/ao/serengeti/helpers/GlobalsTest.java → .../ms/ao/serengeti/helpers/GlobalsTest.java
@@ -1,10 +1,7 @@
-package gl.ao.serengeti.helpers;
+package ms.ao.serengeti.helpers;
 
-import gl.ao.serengeti.helpers.Globals;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.io.NotSerializableException;
 import java.util.Arrays;
 
 import static org.junit.jupiter.api.Assertions.*;

diff --git a/...ao/serengeti/helpers/ShutdownHandler.java → ...ao/serengeti/helpers/ShutdownHandler.java b/...ao/serengeti/helpers/ShutdownHandler.java → ...ao/serengeti/helpers/ShutdownHandler.java
@@ -1,4 +1,6 @@
-package gl.ao.serengeti.helpers;
+package ms.ao.serengeti.helpers;
+
+import ms.ao.serengeti.Serengeti;
 
 public class ShutdownHandler {
 
@@ -13,7 +15,7 @@ public ShutdownHandler() {
 
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {
             System.out.println("Safe Shutdown Initiated..");
-            if (gl.ao.serengeti.Serengeti.storageScheduler.performPersistToDisk()) {
+            if (Serengeti.storageScheduler.performPersistToDisk()) {
                 System.out.println("Safe Shutdown Completed Succesfully");
             }
         }));

diff --git a/...java/gl/ao/serengeti/network/Network.java → ...java/ms/ao/serengeti/network/Network.java b/...java/gl/ao/serengeti/network/Network.java → ...java/ms/ao/serengeti/network/Network.java
@@ -1,8 +1,8 @@
-package gl.ao.serengeti.network;
+package ms.ao.serengeti.network;
 
-import gl.ao.serengeti.Serengeti;
-import gl.ao.serengeti.helpers.Globals;
-import gl.ao.serengeti.storage.Storage;
+import ms.ao.serengeti.Serengeti;
+import ms.ao.serengeti.helpers.Globals;
+import ms.ao.serengeti.storage.Storage;
 import org.json.JSONArray;
 import org.json.JSONObject;
 

diff --git a/...va/gl/ao/serengeti/query/QueryEngine.java → ...va/ms/ao/serengeti/query/QueryEngine.java b/...va/gl/ao/serengeti/query/QueryEngine.java → ...va/ms/ao/serengeti/query/QueryEngine.java
@@ -1,7 +1,7 @@
-package gl.ao.serengeti.query;
+package ms.ao.serengeti.query;
 
-import gl.ao.serengeti.Serengeti;
-import gl.ao.serengeti.storage.StorageResponseObject;
+import ms.ao.serengeti.Serengeti;
+import ms.ao.serengeti.storage.StorageResponseObject;
 import org.json.JSONObject;
 
 import java.util.ArrayList;

diff --git a/.../java/gl/ao/serengeti/query/QueryLog.java → .../java/ms/ao/serengeti/query/QueryLog.java b/.../java/gl/ao/serengeti/query/QueryLog.java → .../java/ms/ao/serengeti/query/QueryLog.java
@@ -1,10 +1,10 @@
-package gl.ao.serengeti.query;
+package ms.ao.serengeti.query;
 
-import gl.ao.serengeti.Serengeti;
-import gl.ao.serengeti.helpers.Globals;
-import gl.ao.serengeti.schema.TableReplicaObject;
-import gl.ao.serengeti.schema.TableStorageObject;
-import gl.ao.serengeti.storage.Storage;
+import ms.ao.serengeti.Serengeti;
+import ms.ao.serengeti.helpers.Globals;
+import ms.ao.serengeti.schema.TableReplicaObject;
+import ms.ao.serengeti.schema.TableStorageObject;
+import ms.ao.serengeti.storage.Storage;
 import org.json.JSONObject;
 
 import java.util.ArrayList;

diff --git a/.../serengeti/query/QueryResponseObject.java → .../serengeti/query/QueryResponseObject.java b/.../serengeti/query/QueryResponseObject.java → .../serengeti/query/QueryResponseObject.java
@@ -1,4 +1,4 @@
-package gl.ao.serengeti.query;
+package ms.ao.serengeti.query;
 
 import org.json.JSONArray;
 import org.json.JSONObject;

diff --git a/...l/ao/serengeti/schema/DatabaseObject.java → ...s/ao/serengeti/schema/DatabaseObject.java b/...l/ao/serengeti/schema/DatabaseObject.java → ...s/ao/serengeti/schema/DatabaseObject.java
@@ -1,7 +1,6 @@
-package gl.ao.serengeti.schema;
+package ms.ao.serengeti.schema;
 
-import gl.ao.serengeti.data.DatabaseObjectData;
-import gl.ao.serengeti.helpers.Globals;
+import ms.ao.serengeti.helpers.Globals;
 
 import java.io.*;
 import java.nio.file.Files;

diff --git a/.../serengeti/schema/TableReplicaObject.java → .../serengeti/schema/TableReplicaObject.java b/.../serengeti/schema/TableReplicaObject.java → .../serengeti/schema/TableReplicaObject.java
@@ -1,6 +1,6 @@
-package gl.ao.serengeti.schema;
+package ms.ao.serengeti.schema;
 
-import gl.ao.serengeti.helpers.Globals;
+import ms.ao.serengeti.helpers.Globals;
 import org.json.JSONObject;
 
 import java.io.*;

diff --git a/.../serengeti/schema/TableStorageObject.java → .../serengeti/schema/TableStorageObject.java b/.../serengeti/schema/TableStorageObject.java → .../serengeti/schema/TableStorageObject.java
@@ -1,6 +1,6 @@
-package gl.ao.serengeti.schema;
+package ms.ao.serengeti.schema;
 
-import gl.ao.serengeti.helpers.Globals;
+import ms.ao.serengeti.helpers.Globals;
 import org.json.JSONObject;
 
 import java.io.*;

diff --git a/...n/java/gl/ao/serengeti/server/Server.java → ...n/java/ms/ao/serengeti/server/Server.java b/...n/java/gl/ao/serengeti/server/Server.java → ...n/java/ms/ao/serengeti/server/Server.java
@@ -1,4 +1,4 @@
-package gl.ao.serengeti.server;
+package ms.ao.serengeti.server;
 
 import java.io.*;
 import java.lang.management.ManagementFactory;
@@ -16,13 +16,13 @@
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
-import gl.ao.serengeti.Serengeti;
-import gl.ao.serengeti.network.Network;
-import gl.ao.serengeti.ui.Dashboard;
-import gl.ao.serengeti.ui.Interactive;
-import gl.ao.serengeti.helpers.Globals;
-import gl.ao.serengeti.query.QueryEngine;
-import gl.ao.serengeti.query.QueryLog;
+import ms.ao.serengeti.Serengeti;
+import ms.ao.serengeti.network.Network;
+import ms.ao.serengeti.ui.Dashboard;
+import ms.ao.serengeti.ui.Interactive;
+import ms.ao.serengeti.helpers.Globals;
+import ms.ao.serengeti.query.QueryEngine;
+import ms.ao.serengeti.query.QueryLog;
 import org.json.JSONArray;
 import org.json.JSONObject;
 

diff --git a/.../ao/serengeti/server/ServerConstants.java → .../ao/serengeti/server/ServerConstants.java b/.../ao/serengeti/server/ServerConstants.java → .../ao/serengeti/server/ServerConstants.java
@@ -1,4 +1,4 @@
-package gl.ao.serengeti.server;
+package ms.ao.serengeti.server;
 
 import java.io.Serializable;
 

diff --git a/...java/gl/ao/serengeti/storage/Storage.java → ...java/ms/ao/serengeti/storage/Storage.java b/...java/gl/ao/serengeti/storage/Storage.java → ...java/ms/ao/serengeti/storage/Storage.java
@@ -1,16 +1,15 @@
-package gl.ao.serengeti.storage;
-
-import gl.ao.serengeti.Serengeti;
-import gl.ao.serengeti.query.QueryLog;
-import gl.ao.serengeti.schema.DatabaseObject;
-import gl.ao.serengeti.helpers.Globals;
-import gl.ao.serengeti.schema.TableReplicaObject;
-import gl.ao.serengeti.schema.TableStorageObject;
+package ms.ao.serengeti.storage;
+
+import ms.ao.serengeti.Serengeti;
+import ms.ao.serengeti.query.QueryLog;
+import ms.ao.serengeti.schema.DatabaseObject;
+import ms.ao.serengeti.helpers.Globals;
+import ms.ao.serengeti.schema.TableReplicaObject;
+import ms.ao.serengeti.schema.TableStorageObject;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.io.File;
-import java.io.FilenameFilter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -140,7 +139,7 @@ public List<String> select(String db, String table, String selectWhat, String co
                 List<String> list = new ArrayList<>();
                 Set<String> uuids = new HashSet<String>();
 
-                JSONArray array = gl.ao.serengeti.Serengeti.network.communicateQueryLogAllNodes(new JSONObject() {{
+                JSONArray array = Serengeti.network.communicateQueryLogAllNodes(new JSONObject() {{
                     put("type", "SelectRespond");
                     put("selectWhat", selectWhat);
                     put("db", db);
@@ -189,7 +188,7 @@ public StorageResponseObject insert(String db, String table, JSONObject json, bo
             if (!tableExists(db, table)) createTable(db, table);
             createTablePathIfNotExists(db, table);
 
-            JSONObject _nodes = gl.ao.serengeti.Serengeti.network.getPrimarySecondary();
+            JSONObject _nodes = Serengeti.network.getPrimarySecondary();
             String _node_primary_id = _nodes.getJSONObject("primary").getString("id");
             String _node_primary_ip = _nodes.getJSONObject("primary").getString("ip");
             String _node_secondary_id = _nodes.getJSONObject("secondary").getString("id");
@@ -205,12 +204,12 @@ public StorageResponseObject insert(String db, String table, JSONObject json, bo
                 put("json", json);
                 put("type", "ReplicateInsertObject");
             }}.toString();
-            gl.ao.serengeti.Serengeti.network.communicateQueryLogSingleNode(_node_primary_id, _node_primary_ip, _jsonInsertReplicate);
-            gl.ao.serengeti.Serengeti.network.communicateQueryLogSingleNode(_node_secondary_id, _node_secondary_ip, _jsonInsertReplicate);
+            Serengeti.network.communicateQueryLogSingleNode(_node_primary_id, _node_primary_ip, _jsonInsertReplicate);
+            Serengeti.network.communicateQueryLogSingleNode(_node_secondary_id, _node_secondary_ip, _jsonInsertReplicate);
 
 
             // tell all nodes about where the replicated data is stored
-            gl.ao.serengeti.Serengeti.network.communicateQueryLogAllNodes(new JSONObject() {{
+            Serengeti.network.communicateQueryLogAllNodes(new JSONObject() {{
                 put("type", "TableReplicaObjectInsertOrReplace");
                 put("db", db);
                 put("table", table);
@@ -261,9 +260,9 @@ public boolean update(String db, String table, String update_key, String update_
                     JSONObject _nodes = tro.getRowReplica(_row_id);
 
                     String _node_primary_id = _nodes.getString("primary");
-                    String _node_primary_ip = gl.ao.serengeti.Serengeti.network.getIPFromUUID(_node_primary_id);
+                    String _node_primary_ip = Serengeti.network.getIPFromUUID(_node_primary_id);
                     String _node_secondary_id = _nodes.getString("secondary");
-                    String _node_secondary_ip = gl.ao.serengeti.Serengeti.network.getIPFromUUID(_node_secondary_id);
+                    String _node_secondary_ip = Serengeti.network.getIPFromUUID(_node_secondary_id);
 
                     JSONObject _json = new JSONObject() {{
                         put("update_key", update_key);
@@ -280,8 +279,8 @@ public boolean update(String db, String table, String update_key, String update_
                         put("json", _json);
                         put("type", "ReplicateUpdateObject");
                     }}.toString();
-                    gl.ao.serengeti.Serengeti.network.communicateQueryLogSingleNode(_node_primary_id, _node_primary_ip, _jsonUpdateReplicate);
-                    gl.ao.serengeti.Serengeti.network.communicateQueryLogSingleNode(_node_secondary_id, _node_secondary_ip, _jsonUpdateReplicate);
+                    Serengeti.network.communicateQueryLogSingleNode(_node_primary_id, _node_primary_ip, _jsonUpdateReplicate);
+                    Serengeti.network.communicateQueryLogSingleNode(_node_secondary_id, _node_secondary_ip, _jsonUpdateReplicate);
 
                     return true;
                 }
@@ -318,9 +317,9 @@ public boolean delete(String db, String table, String where_col, String where_va
                     JSONObject _nodes = tro.getRowReplica(_row_id);
 
                     String _node_primary_id = _nodes.getString("primary");
-                    String _node_primary_ip = gl.ao.serengeti.Serengeti.network.getIPFromUUID(_node_primary_id);
+                    String _node_primary_ip = Serengeti.network.getIPFromUUID(_node_primary_id);
                     String _node_secondary_id = _nodes.getString("secondary");
-                    String _node_secondary_ip = gl.ao.serengeti.Serengeti.network.getIPFromUUID(_node_secondary_id);
+                    String _node_secondary_ip = Serengeti.network.getIPFromUUID(_node_secondary_id);
 
                     JSONObject _json = new JSONObject() {{
                         put("where_col", where_col);
@@ -335,11 +334,11 @@ public boolean delete(String db, String table, String where_col, String where_va
                         put("json", _json);
                         put("type", "ReplicateDeleteObject");
                     }}.toString();
-                    gl.ao.serengeti.Serengeti.network.communicateQueryLogSingleNode(_node_primary_id, _node_primary_ip, _jsonDeleteReplicate);
-                    gl.ao.serengeti.Serengeti.network.communicateQueryLogSingleNode(_node_secondary_id, _node_secondary_ip, _jsonDeleteReplicate);
+                    Serengeti.network.communicateQueryLogSingleNode(_node_primary_id, _node_primary_ip, _jsonDeleteReplicate);
+                    Serengeti.network.communicateQueryLogSingleNode(_node_secondary_id, _node_secondary_ip, _jsonDeleteReplicate);
 
                     // tell all nodes about where the replicated data is stored
-                    gl.ao.serengeti.Serengeti.network.communicateQueryLogAllNodes(new JSONObject() {{
+                    Serengeti.network.communicateQueryLogAllNodes(new JSONObject() {{
                         put("type", "TableReplicaObjectDelete");
                         put("db", db);
                         put("table", table);
@@ -385,7 +384,7 @@ public boolean createDatabase(String db, boolean isReplicationAction) {
             Files.write(file, data);
 
             //create directory path if not exists
-            gl.ao.serengeti.Serengeti.storage.createDatabasePathIfNotExists(db);
+            Serengeti.storage.createDatabasePathIfNotExists(db);
 
             loadMetaDatabasesToMemory();
 

diff --git a/...o/serengeti/storage/StorageReshuffle.java → ...o/serengeti/storage/StorageReshuffle.java b/...o/serengeti/storage/StorageReshuffle.java → ...o/serengeti/storage/StorageReshuffle.java
@@ -1,5 +1,6 @@
-package gl.ao.serengeti.storage;
+package ms.ao.serengeti.storage;
 
+import ms.ao.serengeti.Serengeti;
 import org.json.JSONObject;
 
 import java.util.Arrays;
@@ -16,15 +17,15 @@ public void queueLostNode(JSONObject node) {
         new Thread(() -> {
             try {
                 Thread.sleep(10000);
-                boolean nodeIsOnline = gl.ao.serengeti.Serengeti.network.nodeIsOnline(json.getString("ip"));
+                boolean nodeIsOnline = Serengeti.network.nodeIsOnline(json.getString("ip"));
 
                 if (!nodeIsOnline) {
                     // find out if we need to move any local data to another node
                     for (String tableKey: Storage.tableReplicaObjects.keySet()) {
                         for (String rowKey: Storage.tableReplicaObjects.get(tableKey).row_replicas.keySet()) {
                             String strRow = Storage.tableReplicaObjects.get(tableKey).row_replicas.get(rowKey);
                             JSONObject jsonRow = new JSONObject(strRow);
-                            JSONObject prisec = gl.ao.serengeti.Serengeti.network.getPrimarySecondary();
+                            JSONObject prisec = Serengeti.network.getPrimarySecondary();
                             String newPrimaryId = ((JSONObject)prisec.get("primary")).getString("id");
                             String newPrimaryIp = ((JSONObject)prisec.get("primary")).getString("ip");
                             String newSecondaryId = ((JSONObject)prisec.get("secondary")).getString("id");
@@ -55,16 +56,16 @@ public void queueLostNode(JSONObject node) {
                                         }}.toString();
 
                                         if (found.equals("primary")) {
-                                            gl.ao.serengeti.Serengeti.network.communicateQueryLogSingleNode(newPrimaryId, newPrimaryIp, _jsonReplaceReplicate);
+                                            Serengeti.network.communicateQueryLogSingleNode(newPrimaryId, newPrimaryIp, _jsonReplaceReplicate);
                                             row_replica = Storage.tableReplicaObjects.get(tableKey).updateNewPrimary(rowKey, newPrimaryId);
                                         } else if (found.equals("secondary")) {
-                                            gl.ao.serengeti.Serengeti.network.communicateQueryLogSingleNode(newPrimaryId, newPrimaryIp, _jsonReplaceReplicate);
+                                            Serengeti.network.communicateQueryLogSingleNode(newPrimaryId, newPrimaryIp, _jsonReplaceReplicate);
                                             row_replica = Storage.tableReplicaObjects.get(tableKey).updateNewSecondary(rowKey, newSecondaryId);
                                         }
 
                                         if (row_replica != null) {
                                             final JSONObject row_replica_final = row_replica;
-                                            gl.ao.serengeti.Serengeti.network.communicateQueryLogAllNodes(new JSONObject() {{
+                                            Serengeti.network.communicateQueryLogAllNodes(new JSONObject() {{
                                                 put("type", "TableReplicaObjectInsertOrReplace");
                                                 put("db", databaseName);
                                                 put("table", tableName);

diff --git a/...engeti/storage/StorageResponseObject.java → ...engeti/storage/StorageResponseObject.java b/...engeti/storage/StorageResponseObject.java → ...engeti/storage/StorageResponseObject.java
@@ -1,4 +1,4 @@
-package gl.ao.serengeti.storage;
+package ms.ao.serengeti.storage;
 
 import java.util.HashMap;
 import java.util.Map;