Compilation failure after merge was fixed

orientechnologies · Oct 24, 2018 · 5177b4b · 5177b4b
1 parent 37ab80a
commit 5177b4b
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 37 deletions.
diff --git a/...m/orientechnologies/orient/core/serialization/serializer/record/binary/HelperClasses.java b/...m/orientechnologies/orient/core/serialization/serializer/record/binary/HelperClasses.java
@@ -36,17 +36,31 @@
 import com.orientechnologies.orient.core.exception.OSerializationException;
 import com.orientechnologies.orient.core.id.ORID;
 import com.orientechnologies.orient.core.id.ORecordId;
-import com.orientechnologies.orient.core.metadata.schema.*;
+import com.orientechnologies.orient.core.metadata.schema.OClass;
+import com.orientechnologies.orient.core.metadata.schema.OGlobalProperty;
+import com.orientechnologies.orient.core.metadata.schema.OProperty;
+import com.orientechnologies.orient.core.metadata.schema.OType;
+import com.orientechnologies.orient.core.metadata.schema.OTypeInterface;
 import com.orientechnologies.orient.core.record.ORecord;
 import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.core.record.impl.ODocumentInternal;
 import com.orientechnologies.orient.core.storage.OStorageProxy;
 import com.orientechnologies.orient.core.storage.impl.local.paginated.ORecordSerializationContext;
 import com.orientechnologies.orient.core.storage.index.sbtreebonsai.local.OBonsaiBucketPointer;
-import com.orientechnologies.orient.core.storage.ridbag.sbtree.*;
+import com.orientechnologies.orient.core.storage.ridbag.sbtree.Change;
+import com.orientechnologies.orient.core.storage.ridbag.sbtree.ChangeSerializationHelper;
+import com.orientechnologies.orient.core.storage.ridbag.sbtree.OBonsaiCollectionPointer;
+import com.orientechnologies.orient.core.storage.ridbag.sbtree.OSBTreeCollectionManager;
+import com.orientechnologies.orient.core.storage.ridbag.sbtree.OSBTreeRidBag;
 
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 /**
  * @author mdjurovi
@@ -459,7 +473,11 @@ protected static void writeSBTreeRidbag(BytesContainer bytes, ORidBag ridbag, UU
     if (pointer == null && context != null) {
       final int clusterId = getHighLevelDocClusterId(ridbag);
       assert clusterId > -1;
-      pointer = ODatabaseRecordThreadLocal.instance().get().getSbTreeCollectionManager().createSBTree(clusterId, ownerUuid);
+      try {
+        pointer = ODatabaseRecordThreadLocal.instance().get().getSbTreeCollectionManager().createSBTree(clusterId, ownerUuid);
+      } catch (IOException e) {
+        throw OException.wrapException(new ODatabaseException("Error during creation of ridbag"), e);
+      }
     }
 
     ((OSBTreeRidBag) ridbag.getDelegate()).setCollectionPointer(pointer);

diff --git a/...ologies/orient/core/serialization/serializer/record/binary/ORecordSerializerBinaryV1.java b/...ologies/orient/core/serialization/serializer/record/binary/ORecordSerializerBinaryV1.java
@@ -1,17 +1,11 @@
 package com.orientechnologies.orient.core.serialization.serializer.record.binary;
 
-import com.orientechnologies.common.exception.OException;
-import com.orientechnologies.common.log.OLogManager;
 import com.orientechnologies.common.serialization.types.OByteSerializer;
 import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
 import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
-import com.orientechnologies.orient.core.db.record.OIdentifiable;
 import com.orientechnologies.orient.core.db.record.ORecordElement;
 import com.orientechnologies.orient.core.db.record.OTrackedMap;
 import com.orientechnologies.orient.core.db.record.ridbag.ORidBag;
-import com.orientechnologies.orient.core.db.record.ridbag.ORidBagDelegate;
-import com.orientechnologies.orient.core.db.record.ridbag.embedded.OEmbeddedRidBag;
-import com.orientechnologies.orient.core.exception.ODatabaseException;
 import com.orientechnologies.orient.core.exception.OSerializationException;
 import com.orientechnologies.orient.core.metadata.OMetadataInternal;
 import com.orientechnologies.orient.core.metadata.schema.OClass;
@@ -26,29 +20,21 @@
 import com.orientechnologies.orient.core.serialization.serializer.record.binary.HelperClasses.MapRecordInfo;
 import com.orientechnologies.orient.core.serialization.serializer.record.binary.HelperClasses.Triple;
 import com.orientechnologies.orient.core.serialization.serializer.record.binary.HelperClasses.Tuple;
-import com.orientechnologies.orient.core.storage.OStorageProxy;
-import com.orientechnologies.orient.core.storage.impl.local.paginated.ORecordSerializationContext;
-import com.orientechnologies.orient.core.storage.index.sbtreebonsai.local.OBonsaiBucketPointer;
-import com.orientechnologies.orient.core.storage.ridbag.sbtree.Change;
-import com.orientechnologies.orient.core.storage.ridbag.sbtree.ChangeSerializationHelper;
-import com.orientechnologies.orient.core.storage.ridbag.sbtree.OBonsaiCollectionPointer;
-import com.orientechnologies.orient.core.storage.ridbag.sbtree.OSBTreeCollectionManager;
-import com.orientechnologies.orient.core.storage.ridbag.sbtree.OSBTreeRidBag;
-
-import java.io.IOException;
+
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.UUID;
 
+import static com.orientechnologies.orient.core.serialization.serializer.record.binary.HelperClasses.getGlobalProperty;
+import static com.orientechnologies.orient.core.serialization.serializer.record.binary.HelperClasses.getTypeFromValueEmbedded;
 import static com.orientechnologies.orient.core.serialization.serializer.record.binary.HelperClasses.readByte;
 import static com.orientechnologies.orient.core.serialization.serializer.record.binary.HelperClasses.readOType;
 import static com.orientechnologies.orient.core.serialization.serializer.record.binary.HelperClasses.readString;
 import static com.orientechnologies.orient.core.serialization.serializer.record.binary.HelperClasses.stringFromBytes;
 import static com.orientechnologies.orient.core.serialization.serializer.record.binary.HelperClasses.writeOType;
+import static com.orientechnologies.orient.core.serialization.serializer.record.binary.HelperClasses.writeString;
 
 public class ORecordSerializerBinaryV1 extends ORecordSerializerBinaryV0 {
 
@@ -106,7 +92,7 @@ private Triple<Signal, Triple<Integer, OType, String>, Integer> processPropertyF
     boolean matchField = matchFieldName.getFirstVal();
     String fieldName = matchFieldName.getSecondVal();
 
-    Integer fieldLength = OVarIntSerializer.readAsInteger(bytes);
+    int fieldLength = OVarIntSerializer.readAsInteger(bytes);
     OType type = getPropertyTypeFromStream(prop, bytes);
 
     if (!matchField) {
@@ -287,7 +273,7 @@ private Triple<Signal, OBinaryField, Integer> processPropertyDeserializeField(in
   public OBinaryField deserializeField(final BytesContainer bytes, final OClass iClass, final String iFieldName) {
     final byte[] field = iFieldName.getBytes();
 
-    final OMetadataInternal metadata = (OMetadataInternal) ODatabaseRecordThreadLocal.instance().get().getMetadata();
+    final OMetadataInternal metadata = ODatabaseRecordThreadLocal.instance().get().getMetadata();
     final OImmutableSchema _schema = metadata.getImmutableSchemaSnapshot();
 
     int headerLength = OVarIntSerializer.readAsInteger(bytes);
@@ -348,11 +334,7 @@ public void deserialize(final ODocument document, final BytesContainer bytes) {
     String fieldName;
     OType type;
     int cumulativeSize = 0;
-    while (true) {
-
-      if (bytes.offset >= headerStart + headerLength)
-        break;
-
+    while (bytes.offset < headerStart + headerLength) {
       OGlobalProperty prop;
       final int len = OVarIntSerializer.readAsInteger(bytes);
       int fieldLength;
@@ -425,10 +407,7 @@ public String[] getFieldNames(ODocument reference, final BytesContainer bytes, b
     final List<String> result = new ArrayList<>();
 
     String fieldName;
-    while (true) {
-      if (bytes.offset >= headerStart + headerLength)
-        break;
-
+    while (bytes.offset < headerStart + headerLength) {
       OGlobalProperty prop;
       final int len = OVarIntSerializer.readAsInteger(bytes);
       if (len > 0) {
@@ -456,7 +435,7 @@ public String[] getFieldNames(ODocument reference, final BytesContainer bytes, b
       }
     }
 
-    return result.toArray(new String[result.size()]);
+    return result.toArray(new String[0]);
   }
 
   private void serializeWriteValues(final BytesContainer headerBuffer, final BytesContainer valuesBuffer, final ODocument document,
@@ -555,7 +534,7 @@ public void serialize(final ODocument document, final BytesContainer bytes, fina
     serializeDocument(document, bytes, clazz);
   }
 
-  protected OClass serializeClass(final ODocument document, final BytesContainer bytes, boolean serializeClassName) {
+  private OClass serializeClass(final ODocument document, final BytesContainer bytes, boolean serializeClassName) {
     final OClass clazz = ODocumentInternal.getImmutableSchemaClass(document);
     if (serializeClassName) {
       if (clazz != null && document.isEmbedded())
@@ -587,7 +566,7 @@ protected <RET> RET deserializeFieldTypedLoopAndReturn(BytesContainer bytes, Str
     int headerStart = bytes.offset;
     int cumulativeLength = 0;
 
-    final OMetadataInternal metadata = (OMetadataInternal) ODatabaseRecordThreadLocal.instance().get().getMetadata();
+    final OMetadataInternal metadata = ODatabaseRecordThreadLocal.instance().get().getMetadata();
     final OImmutableSchema _schema = metadata.getImmutableSchemaSnapshot();
 
     while (true) {
@@ -615,6 +594,7 @@ protected <RET> RET deserializeFieldTypedLoopAndReturn(BytesContainer bytes, Str
 
         bytes.offset = valuePos;
         Object value = deserializeValue(bytes, type, null, false, fieldLength, serializerVersion, false);
+        //noinspection unchecked
         return (RET) value;
       } else {
         // LOAD GLOBAL PROPERTY BY ID
@@ -635,6 +615,7 @@ protected <RET> RET deserializeFieldTypedLoopAndReturn(BytesContainer bytes, Str
         bytes.offset = valuePos;
 
         Object value = deserializeValue(bytes, type, null, false, fieldLength, serializerVersion, false);
+        //noinspection unchecked
         return (RET) value;
       }
     }

diff --git a/server/src/main/java/com/orientechnologies/orient/server/OConnectionBinaryExecutor.java b/server/src/main/java/com/orientechnologies/orient/server/OConnectionBinaryExecutor.java
@@ -81,6 +81,8 @@
 import com.orientechnologies.orient.client.remote.message.OListDatabasesResponse;
 import com.orientechnologies.orient.client.remote.message.OListGlobalConfigurationsRequest;
 import com.orientechnologies.orient.client.remote.message.OListGlobalConfigurationsResponse;
+import com.orientechnologies.orient.client.remote.message.OLockRecordRequest;
+import com.orientechnologies.orient.client.remote.message.OLockRecordResponse;
 import com.orientechnologies.orient.client.remote.message.OLowerPhysicalPositionsRequest;
 import com.orientechnologies.orient.client.remote.message.OLowerPhysicalPositionsResponse;
 import com.orientechnologies.orient.client.remote.message.OOpen37Request;
@@ -136,6 +138,8 @@
 import com.orientechnologies.orient.client.remote.message.OSubscribeSequencesResponse;
 import com.orientechnologies.orient.client.remote.message.OSubscribeStorageConfigurationRequest;
 import com.orientechnologies.orient.client.remote.message.OSubscribeStorageConfigurationResponse;
+import com.orientechnologies.orient.client.remote.message.OUnlockRecordRequest;
+import com.orientechnologies.orient.client.remote.message.OUnlockRecordResponse;
 import com.orientechnologies.orient.client.remote.message.OUnsubscribLiveQueryResponse;
 import com.orientechnologies.orient.client.remote.message.OUnsubscribeLiveQueryRequest;
 import com.orientechnologies.orient.client.remote.message.OUnsubscribeRequest;
@@ -189,7 +193,6 @@
 import com.orientechnologies.orient.core.storage.OCluster;
 import com.orientechnologies.orient.core.storage.OPhysicalPosition;
 import com.orientechnologies.orient.core.storage.ORecordMetadata;
-import com.orientechnologies.orient.core.storage.OStorage;
 import com.orientechnologies.orient.core.storage.OStorageProxy;
 import com.orientechnologies.orient.core.storage.impl.local.paginated.OOfflineClusterException;
 import com.orientechnologies.orient.core.storage.index.sbtree.OTreeInternal;