RELEASE 2021.1

Author: yuriy-glotanov

doc/InterferenceManual.pdf

@@ -7,7 +7,7 @@
 
     <groupId>su.interference</groupId>
     <artifactId>interference</artifactId>
-    <version>2020.3</version>
+    <version>2021.1</version>
     <packaging>jar</packaging>
 
     <name>interference</name>

pom.xml

@@ -1,36 +1,36 @@
-/**
- The MIT License (MIT)
-
- Copyright (c) 2010-2019 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
- 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.
-
- */
-
-package su.interference.proxy;
-
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * @author Yuriy Glotanov
- * @since 1.0
- */
-
-public interface GenericResult {
-    Object getValueByName(String name) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException;
-}
+/**
+ The MIT License (MIT)
+
+ Copyright (c) 2010-2021 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
+ 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.
+
+ */
+
+package su.interference.api;
+
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * @author Yuriy Glotanov
+ * @since 1.0
+ */
+
+public interface GenericResult {
+    Object getValueByName(String name) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException;
+}

…su/interference/proxy/GenericResult.java …a/su/interference/api/GenericResult.javasrc/main/java/su/interference/proxy/GenericResult.java renamed to src/main/java/su/interference/api/GenericResult.java src/main/java/su/interference/proxy/GenericResult.java renamed to src/main/java/su/interference/api/GenericResult.java

@@ -119,7 +119,7 @@ public class Config {
     public final int CLEANUP_PROTECTION_THR = 1000;
     public final int IX_CLEANUP_PROTECTION_THR = 2000;
     public final int HEAP_USE_THR_DATA = 60;
-    public final int HEAP_USE_THR_INDX = 70;
+    public final int HEAP_USE_THR_INDX = 60;
     public final int HEAP_USE_THR_TEMP = 40;
     public final int HEAP_USE_THR_UNDO = 50;
 

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

@@ -1,7 +1,7 @@
 /**
  The MIT License (MIT)
 
- Copyright (c) 2010-2020 head systems, ltd
+ Copyright (c) 2010-2021 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
@@ -70,7 +70,9 @@ public class DataChunk implements Chunk {
     private UndoChunk uc;
     private FrameData uframe;
     private boolean terminate;
-    private final CustomSerializer sr = new CustomSerializer();
+    private boolean external;
+    private static final CustomSerializer sr = new CustomSerializer();
+    private static final CustomSerializer sr_ = new CustomSerializer(true);
 
     //returns datacolumn set
     public ValueSet getDcs() {
@@ -154,7 +156,7 @@ private ValueSet getDcsFromBytes() {
                     if (Modifier.isPrivate(m)) {
                         cs[i].setAccessible(true);
                     }
-                    dcs.getValueSet()[i] = sr.deserialize(data, cs[i]);
+                    dcs.getValueSet()[i] = this.external ? sr_.deserialize(data, cs[i]) : sr.deserialize(data, cs[i]);
                     if (a != null) {
                         id = (Comparable) dcs.getValueSet()[i];
                     }
@@ -170,6 +172,16 @@ private ValueSet getDcsFromBytes() {
         }
     }
 
+    public GenericObject getGenericObject() {
+        final ValueSet vs = getDcs();
+        final Field[] cs = t.getFields();
+        final Map<String, Object> vmap = new HashMap();
+        for (int i=0; i<cs.length; i++) {
+            vmap.put(cs[i].getName(), vs.getValueSet()[i]);
+        }
+        return new GenericObject(vmap);
+    }
+
     public UndoChunk getUndoChunk() {
         if (header==null) {
             return null;
@@ -238,11 +250,11 @@ public byte[] getSerializedId (Session s) throws InvocationTargetException, NoSu
                 if (t.isNoTran()) {
                     final Method z = t.getIdmethod();
                     id = (Comparable) z.invoke(entity, null);
-                    serializedId = sr.serialize(idf.getType().getName(), id);
+                    serializedId = this.external ? sr_.serialize(idf.getType().getName(), id) : sr.serialize(idf.getType().getName(), id);
                 } else {
                     final Method z = t.getIdmethod_();
                     id = (Comparable) z.invoke(entity, new Object[]{s});
-                    serializedId = sr.serialize(idf.getType().getName(), id);
+                    serializedId = this.external ? sr_.serialize(idf.getType().getName(), id) : sr.serialize(idf.getType().getName(), id);
                 }
             }
 
@@ -278,7 +290,7 @@ public DataChunk (ValueSet vs, Session s, RowId r, Table t) throws ClassNotFound
         final ByteString res = new ByteString();
         final Field[] f = t.getFields();
         for (int i=0; i<f.length; i++) {
-            byte[] b = sr.serialize(f[i].getType().getName(), vs.getValueSet()[i]);
+            byte[] b = this.external ? sr_.serialize(f[i].getType().getName(), vs.getValueSet()[i]) : sr.serialize(f[i].getType().getName(), vs.getValueSet()[i]);
             if (b==null) { b = new byte[]{}; } //stub for reflection convert null fields to byte[] object in DataRecord
             if (Types.isVarType(f[i])) {
                 res.addBytesFromInt(b.length);
@@ -331,6 +343,15 @@ public DataChunk (Object o, Session s, Table t) {
         this(o, s, null, t);
     }
 
+    //serializer INSERT ONLY!!! (with generate Id value)
+    public DataChunk (Object o, Session s, Table t, boolean external) {
+        this.entity = o;
+        this.t = t;
+        this.state = NORMAL_STATE;
+        this.external = external;
+        this.header = new RowHeader(null, null, getChunk().length, false);
+    }
+
     //serializer INSERT ONLY!!! (with generate Id value) - rowid for index chunk
     public DataChunk (Object o, Session s, RowId r, Table t) {
         this.entity = o;
@@ -357,6 +378,15 @@ public DataChunk (byte[] b, Table t, RowHeader h, DataChunk source) {
         this.t = t;
     }
 
+    //constructor ONLY for external client deserializer
+    public DataChunk (byte[] b, Table t, boolean external) {
+        this.chunk  = b;
+        this.t = t;
+        this.state = INIT_STATE;
+        this.external = external;
+        this.header = new RowHeader(null, null, getChunk().length, false);
+    }
+
     public byte[] getChunk () {
         if (state == INIT_STATE) {
             return chunk;
@@ -543,6 +573,27 @@ public Object getStandaloneEntity() {
         return null;
     }
 
+    public Object getClientStandaloneEntity() {
+        try {
+            final ValueSet dcs = getDcs();
+            final Object o = t.getInstance(); //returns empty instance
+            final Field[] cs = t.getFields();
+            for (int i=0; i<cs.length; i++) {
+                final int m = cs[i].getModifiers();
+                if (Modifier.isPrivate(m)) {
+                    cs[i].setAccessible(true);
+                }
+                if (dcs.getValueSet()[i]!=null) {
+                    cs[i].set(o, dcs.getValueSet()[i]);
+                }
+            }
+            return o;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     //for bootstrap system / not use table objects
     public Object getEntity (Class c, Object[] params) {
         SystemEntity ca = (SystemEntity)c.getAnnotation(SystemEntity.class);
@@ -665,7 +716,7 @@ public DataChunk restore(UndoChunk uc) throws Exception {
     private byte[] getBytes(Field f, Object o) throws IllegalAccessException, UnsupportedEncodingException, ClassNotFoundException, InternalException, InstantiationException {
         final String t = f.getType().getName();
         final Object fo = f.get(o);
-        return sr.serialize(t, fo);
+        return this.external ? sr_.serialize(t, fo) : sr.serialize(t, fo);
     }
 
     private int getLen(Field f, Object o) throws IllegalAccessException, UnsupportedEncodingException, ClassNotFoundException, InternalException, InstantiationException {

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

@@ -0,0 +1,47 @@
+/**
+ The MIT License (MIT)
+
+ Copyright (c) 2010-2021 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
+ 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.
+
+ */
+
+package su.interference.core;
+
+import su.interference.api.GenericResult;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @author Yuriy Glotanov
+ * @since 1.0
+ */
+
+public class GenericObject implements Serializable, GenericResult {
+   private final Map<String, Object> vmap;
+
+   protected GenericObject(Map<String, Object> vmap) {
+       this.vmap = vmap;
+   }
+
+   public Object getValueByName(String name) {
+       return vmap.get(name);
+   }
+}