Merge branch '2.1.x'

build.xml

@@ -5,7 +5,7 @@
     <property environment="env"/>
     <property name="vendor" value="Orient Technologies Ltd"/>
     <property name="product" value="OrientDB"/>
-    <property name="version" value="2.1.6"/>
+    <property name="version" value="2.1.7"/>
     <condition property="community.release" value="${releaseHome}/orientdb-community-${version}"
                else="../releases/orientdb-community-${version}">
         <isset property="releaseHome"/>

client/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7</version>
         <relativePath>../</relativePath>
     </parent>
 

client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java

@@ -1421,6 +1421,7 @@ public void commit(final OTransaction iTx, Runnable callback) {
         handleDBFreeze();
       } catch (Exception e) {
         handleException(network, "Error on commit", e);
+        iTx.restore();
 
       } finally {
         OStorageRemoteThreadLocal.INSTANCE.get().commandExecuting = false;
@@ -1659,21 +1660,22 @@ public void updateClusterConfiguration(final String iConnectedURL, final byte[]
     // TEMPORARY FIX: DISTRIBUTED MODE DOESN'T SUPPORT TREE BONSAI, KEEP ALWAYS EMBEDDED RIDS
     OGlobalConfiguration.RID_BAG_EMBEDDED_TO_SBTREEBONSAI_THRESHOLD.setValue(Integer.MAX_VALUE);
 
-    // UPDATE IT
-    synchronized (serverURLs) {
+    final List<ODocument> members;
+    synchronized (clusterConfiguration) {
       clusterConfiguration.fromStream(obj);
-
       clusterConfiguration.toString();
+      members = clusterConfiguration.field("members");
+    }
+
+    // UPDATE IT
+    synchronized (serverURLs) {
 
-      final List<ODocument> members = clusterConfiguration.field("members");
       if (members != null) {
         serverURLs.clear();
 
         // ADD CURRENT SERVER AS FIRST
         addHost(iConnectedURL);
 
-        // parseServerURLs();
-
         for (ODocument m : members)
           if (m != null && !serverURLs.contains((String) m.field("name"))) {
             final Collection<Map<String, Object>> listeners = ((Collection<Map<String, Object>>) m.field("listeners"));

core/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.orientechnologies</groupId>
         <artifactId>orientdb-parent</artifactId>
-        <version>2.1.6</version>
+        <version>2.1.7</version>
         <relativePath>../</relativePath>
     </parent>
 

core/src/main/grammar/OrientSQL.jjt

@@ -1010,25 +1010,14 @@ ODeleteEdgeStatement DeleteEdgeWhereStatement():
 }
 
 OUpdateStatement UpdateStatement():
-{ OUpdateOperations lastOperations; }
+{
+    OUpdateOperations lastOperations;
+    ORid lastRid;
+ }
 {
     (
     	<UPDATE>
-    	(
-    	    jjtThis.targetRid = Rid()
-    	    |
-    		jjtThis.targetClass = Identifier()
-    		|
-    		jjtThis.targetCluster = Cluster()
-    		|
-    		jjtThis.targetIndex = IndexIdentifier()
-    		|
-    		(
-    		    <LPAREN>
-    		    jjtThis.targetQuery = QueryStatement()
-    		    <RPAREN>
-    		)
-    	)
+    	jjtThis.target = FromClause()
     	( lastOperations = UpdateOperations() { jjtThis.operations.add(lastOperations); } )+
     	[ <UPSERT> { jjtThis.upsert = true; } ]
     	[

core/src/main/java/com/orientechnologies/common/concur/lock/OReadersWriterSpinLock.java

@@ -35,23 +35,20 @@
  * @author Andrey Lomakin (a.lomakin-at-orientechnologies.com)
  * @since 8/18/14
  */
-public class OReadersWriterSpinLock extends AbstractOwnableSynchronizer implements OOrientStartupListener, OOrientShutdownListener {
-  private final ODistributedCounter                distributedCounter = new ODistributedCounter();
+public class OReadersWriterSpinLock extends AbstractOwnableSynchronizer {
+  private final ODistributedCounter distributedCounter = new ODistributedCounter();
 
-  private final AtomicReference<WNode>             tail               = new AtomicReference<WNode>();
-  private volatile ThreadLocal<OModifiableInteger> lockHolds          = new InitOModifiableInteger();
+  private final AtomicReference<WNode>          tail      = new AtomicReference<WNode>();
+  private final ThreadLocal<OModifiableInteger> lockHolds = new InitOModifiableInteger();
 
-  private volatile ThreadLocal<WNode>              myNode             = new InitWNode();
-  private volatile ThreadLocal<WNode>              predNode           = new ThreadLocal<WNode>();
+  private final ThreadLocal<WNode> myNode   = new InitWNode();
+  private final ThreadLocal<WNode> predNode = new ThreadLocal<WNode>();
 
   public OReadersWriterSpinLock() {
     final WNode wNode = new WNode();
     wNode.locked = false;
 
     tail.set(wNode);
-
-    Orient.instance().registerWeakOrientStartupListener(this);
-    Orient.instance().registerWeakOrientShutdownListener(this);
   }
 
   public void acquireReadLock() {
@@ -169,26 +166,6 @@ public void releaseWriteLock() {
     assert lHolds.intValue() == 0;
   }
 
-  @Override
-  public void onShutdown() {
-    lockHolds = null;
-    myNode = null;
-    predNode = null;
-  }
-
-  @Override
-  public void onStartup() {
-    if (lockHolds == null)
-      lockHolds = new InitOModifiableInteger();
-
-    if (myNode == null)
-      myNode = new InitWNode();
-
-    if (predNode == null)
-      predNode = new ThreadLocal<WNode>();
-
-  }
-
   private static final class InitWNode extends ThreadLocal<WNode> {
     @Override
     protected WNode initialValue() {
@@ -206,7 +183,7 @@ protected OModifiableInteger initialValue() {
   private final static class WNode {
     private final Queue<Thread> waitingReaders = new ConcurrentLinkedQueue<Thread>();
 
-    private volatile boolean    locked         = true;
-    private volatile Thread     waitingWriter;
+    private volatile boolean locked = true;
+    private volatile Thread waitingWriter;
   }
 }

core/src/main/java/com/orientechnologies/common/directmemory/ODirectMemoryMXBean.java

@@ -0,0 +1,15 @@
+package com.orientechnologies.common.directmemory;
+
+/**
+ * @author Andrey Lomakin <lomakin.andrey@gmail.com>.
+ * @since 9/8/2015
+ */
+public interface ODirectMemoryMXBean {
+  long getSize();
+
+  long getSizeInKB();
+
+  long getSizeInMB();
+
+  long getSizeInGB();
+}