add remote non blocking query tests with relative fixes, issue #6267

core/src/main/java/com/orientechnologies/orient/core/sql/query/OSQLNonBlockingQuery.java

@@ -19,12 +19,6 @@
  */
 package com.orientechnologies.orient.core.sql.query;
 
-import com.orientechnologies.orient.core.command.OCommandRequestAsynch;
-import com.orientechnologies.orient.core.command.OCommandResultListener;
-import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
-import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
-import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
-
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -35,6 +29,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import com.orientechnologies.orient.core.command.OCommandRequestAsynch;
+import com.orientechnologies.orient.core.command.OCommandResultListener;
+import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
+import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
+import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
+
 /**
  * SQL asynchronous query. When executed the caller does not wait for the execution, rather the listener will be called for each
  * item found in the query. OSQLAsynchQuery has been built on top of this. NOTE: if you're working with remote databases don't
@@ -275,7 +275,11 @@ public <RET> RET execute(final Object... iArgs) {
         public void run() {
           db.activateOnCurrentThread();
           try {
-            OSQLNonBlockingQuery.super.execute(iArgs);
+            OSQLAsynchQuery<T> query = new OSQLAsynchQuery<T>(OSQLNonBlockingQuery.this.getText(),
+                OSQLNonBlockingQuery.this.getResultListener());
+            query.setFetchPlan(OSQLNonBlockingQuery.this.getFetchPlan());
+            query.setLimit(OSQLNonBlockingQuery.this.getLimit());
+            query.execute(iArgs);
           } catch (RuntimeException e) {
             if (getResultListener() != null) {
               getResultListener().end();

graphdb/src/test/java/com/orientechnologies/orient/graph/GraphNonBlockingQueryRemote.java

@@ -0,0 +1,108 @@
+package com.orientechnologies.orient.graph;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.MBeanRegistrationException;
+import javax.management.MalformedObjectNameException;
+import javax.management.NotCompliantMBeanException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.orientechnologies.orient.client.remote.OServerAdmin;
+import com.orientechnologies.orient.core.Orient;
+import com.orientechnologies.orient.core.command.OCommandResultListener;
+import com.orientechnologies.orient.core.db.ODatabaseDocumentInternal;
+import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
+import com.orientechnologies.orient.core.metadata.schema.OType;
+import com.orientechnologies.orient.core.record.impl.ODocument;
+import com.orientechnologies.orient.core.sql.query.OSQLNonBlockingQuery;
+import com.orientechnologies.orient.server.OServer;
+import com.tinkerpop.blueprints.impls.orient.OrientGraph;
+import com.tinkerpop.blueprints.impls.orient.OrientGraphRemoteTest;
+import com.tinkerpop.blueprints.impls.orient.OrientVertex;
+import com.tinkerpop.blueprints.impls.orient.TestSelectProjectionVertexRemote;
+
+/**
+ * Created by tglman on 01/07/16.
+ */
+public class GraphNonBlockingQueryRemote {
+
+  private OServer server;
+
+  @Before
+  public void before() throws ClassNotFoundException, MalformedObjectNameException, InstanceAlreadyExistsException,
+      NotCompliantMBeanException, MBeanRegistrationException, InvocationTargetException, NoSuchMethodException,
+      InstantiationException, IOException, IllegalAccessException {
+    server = new OServer(false);
+    server.startup(OrientGraphRemoteTest.class.getResourceAsStream("/embedded-server-config-single-run.xml"));
+    server.activate();
+    OServerAdmin admin = new OServerAdmin("remote:localhost:3064");
+    admin.connect("root", "root");
+    admin.createDatabase(GraphNonBlockingQueryRemote.class.getSimpleName(), "graph", "memory");
+    admin.close();
+  }
+
+  @After
+  public void after() {
+    server.shutdown();
+    Orient.instance().startup();
+  }
+
+  @Test
+  public void testNonBlockingClose() throws ExecutionException, InterruptedException {
+    OrientGraph database = new OrientGraph("remote:localhost:3064/" + GraphNonBlockingQueryRemote.class.getSimpleName());
+    database.createVertexType("Prod").createProperty("something", OType.STRING);
+    for (int i = 0; i < 21; i++) {
+      OrientVertex vertex = database.addVertex("class:Prod");
+      vertex.setProperty("something", "value");
+      vertex.save();
+    }
+    database.commit();
+    final CountDownLatch ended = new CountDownLatch(21);
+    try {
+      OSQLNonBlockingQuery<Object> test = new OSQLNonBlockingQuery<Object>("select * from Prod ", new OCommandResultListener() {
+        int resultCount = 0;
+
+        @Override
+        public boolean result(Object iRecord) {
+          resultCount++;
+
+          ODocument odoc = ((ODocument) iRecord);
+          for (String name : odoc.fieldNames()) { // <----------- PROBLEM
+            assertEquals("something", name);
+          }
+          ended.countDown();
+          return resultCount > 20 ? false : true;
+        }
+
+        @Override
+        public void end() {
+          ended.countDown();
+        }
+
+        @Override
+        public Object getResult() {
+          return resultCount;
+        }
+      });
+
+      database.command(test).execute();
+
+      assertTrue(ended.await(10, TimeUnit.SECONDS));
+
+    } finally {
+      database.shutdown();
+    }
+  }
+
+}