Merge pull request #69 from yuriy-glotanov/2025.1

RELEASE 2025.1

Author: interference-project

src/main/java/su/interference/core/IndexFrame.java

@@ -291,25 +291,36 @@ public synchronized ValueSet sort() throws InternalException {
 
     //accepted only to node element lists
     //for unique indexes
-    public synchronized DataChunk getChildElementPtr(ValueSet value) throws InternalException {
-        //todo if (!this.sorted) {
-            this.sort();
-        //}
-        for (Chunk ie : this.data.getChunks()) {
-            if (((DataChunk)ie).getDcs().compareTo(value)>=0) {
-                return ((DataChunk)ie); //known as ptr for node element
+    public synchronized DataChunk getChildElementPtr(ValueSet key) {
+        this.sort();
+        List<Chunk> chunks = (List) this.data.getChunks();
+
+        int low = 0;
+        int high = chunks.size() - 1;
+
+        DataChunk result = null;
+        while (low <= high) {
+            int mid = (low + high) >>> 1;
+            Comparable midVal = chunks.get(mid).getDcs();
+            int cmp = midVal.compareTo(key);
+
+            if (cmp < 0) {
+                low = mid + 1;
+            } else if (cmp > 0) {
+                result = (DataChunk) chunks.get(mid);
+                high = mid - 1;
+            } else {
+                return (DataChunk) chunks.get(mid);
             }
         }
-        return null;
+        return result;
     }
 
     //accepted only to node element lists
     //for non-unique indexes
     public synchronized ArrayList<Long> getChildElementsPtr(ValueSet value) throws InternalException {
-        //todo if (!this.sorted) {
-            this.sort();
-        //}
-        ArrayList<Long> r = new ArrayList<Long>();
+        this.sort();
+        ArrayList<Long> r = new ArrayList<>();
         for (Chunk ie : this.data.getChunks()) {
             if (((DataChunk)ie).getDcs().compareTo(value) == 0) {
                 r.add (((DataChunk)ie).getHeader().getFramePtr()); //known as ptr for node element

src/main/java/su/interference/core/Instance.java

@@ -292,11 +292,16 @@ public String getCodePage() throws ClassNotFoundException, InternalException, In
         return Config.getConfig().CODEPAGE;
     }
 
-    public String getDateFormat() throws ClassNotFoundException, InternalException, InstantiationException, IllegalAccessException {
-        if (systemState==SYSTEM_STATE_UP) {
-            return Storage.getStorage().getDateFormat();
+    public String getDateFormat() {
+        try {
+            if (systemState == SYSTEM_STATE_UP) {
+                return Storage.getStorage().getDateFormat();
+            }
+        } catch (Exception e) {
+            logger.error("Exception occured during Instance.getDateFormat", e);
+        } finally {
+            return Config.getConfig().DATEFORMAT;
         }
-        return Config.getConfig().DATEFORMAT;
     }
 
     public String getLocalhost() {

src/main/java/su/interference/serialize/CustomSerializer.java

@@ -1,7 +1,7 @@
 /**
  The MIT License (MIT)
 
- Copyright (c) 2010-2021 head systems, ltd
+ Copyright (c) 2010-2025 head systems, ltd
 
  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
@@ -53,6 +53,9 @@ public class CustomSerializer implements SerializerApi {
 
     private byte[] b = new byte[]{};
     private final boolean external;
+    private static SimpleDateFormat df = new SimpleDateFormat(Instance.getInstance() == null ? Config.getConfig().DATEFORMAT : Instance.getInstance().getDateFormat());
+    private static SimpleDateFormat extdf = new SimpleDateFormat(Config.getConfig().DATEFORMAT);
+
 
     public CustomSerializer() {
         this.external = false;
@@ -286,8 +289,7 @@ public Object deserialize (String v, String t) throws UnsupportedEncodingExcepti
                 case (t_double):
                     return Double.parseDouble(v);
                 case (t_date):
-                    SimpleDateFormat df = new SimpleDateFormat(this.external ? Config.getConfig().DATEFORMAT : Instance.getInstance() == null ? Config.getConfig().DATEFORMAT : Instance.getInstance().getDateFormat());
-                    return df.parse(v);
+                    return this.external ? extdf.parse(v) : df.parse(v);
                 case (t_string):
                     return v;
             }