Permalink
Browse files

Merge branch '1.7-RC1'

Conflicts:

server/src/main/java/com/orientechnologies/orient/server/schedule/OSched
uleHandler.java
  • Loading branch information...
2 parents bdb71f8 + 28de747 commit 501dac7919b0c0532b7849a010da46f7628fb2da @lvca lvca committed Feb 6, 2014
Showing 519 changed files with 25,141 additions and 14,212 deletions.
@@ -41,7 +41,7 @@
<mkdir dir="${project.lib}"/>
<javac destdir="${project.build}" debug="${project.is-debug}" debuglevel="${project.debug-level}"
target="${project.target-comp}" source="${project.source-comp}" verbose="false"
- includeAntRuntime="false">
+ includeAntRuntime="false" encoding="UTF-8">
<src path="${project.src}"/>
<src path="${project.src2}"/>
<classpath refid="project.classpath"/>
Oops, something went wrong.
View
@@ -5,7 +5,7 @@
<property environment="env"/>
<property name="vendor" value="NuvolaBase Ltd"/>
<property name="product" value="OrientDB"/>
- <property name="version" value="1.6.4"/>
+ <property name="version" value="1.7-rc1"/>
<condition property="community.release" value="${releaseHome}/orientdb-community-${version}"
else="../releases/orientdb-community-${version}">
<isset property="releaseHome"/>
@@ -31,6 +31,7 @@
<fileset dir="server" includes="build.xml"/>
<fileset dir="distributed" includes="build.xml"/>
<fileset dir="tools" includes="build.xml"/>
+ <fileset dir="graphdb" includes="build.xml"/>
<fileset dir="tests" includes="build.xml"/>
</subant>
@@ -128,12 +129,6 @@
<target name="install" depends="init">
<delegate target="install"/>
- <subant target="install">
- <property name="global.lib" value="../${community.release}/lib"/>
- <property name="version" value="${version}"/>
-
- <fileset dir="graphdb" includes="build.xml"/>
- </subant>
<copy todir="${community.release}/" flatten="true">
<fileset dir="." includes="*.txt"/>
@@ -165,7 +160,7 @@
<fileset dir="." includes="tools/config/*"/>
<fileset dir="." includes="server/config/*"/>
<fileset dir="." includes="distributed/config/*"/>
- <fileset dir="graphdb/config" includes="*.xml"/>
+ <fileset dir="graphdb/config" includes="*.xml" erroronmissingdir="false"/>
</copy>
<copy todir="${community.release}/lib" flatten="true">
View
@@ -24,7 +24,7 @@
<parent>
<groupId>com.orientechnologies</groupId>
<artifactId>orientdb-parent</artifactId>
- <version>1.6.4</version>
+ <version>1.7-rc1</version>
<relativePath>../</relativePath>
</parent>
@@ -35,6 +35,7 @@
<properties>
<osgi.import>*</osgi.import>
<osgi.export>com.orientechnologies.orient.client.*</osgi.export>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
@@ -43,6 +44,19 @@
<artifactId>orientdb-enterprise</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.14.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.9.5</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
@@ -102,7 +102,7 @@ public static File getConfigurationFile() {
return getConfigurationFile(null);
}
- protected static String getServerRootPassword() throws IOException {
+ public static String getServerRootPassword() throws IOException {
return getServerRootPassword("server");
}
@@ -21,7 +21,11 @@
import com.orientechnologies.orient.core.config.OStorageClusterConfiguration;
import com.orientechnologies.orient.core.id.OClusterPosition;
import com.orientechnologies.orient.core.id.OClusterPositionFactory;
-import com.orientechnologies.orient.core.storage.*;
+import com.orientechnologies.orient.core.storage.OCluster;
+import com.orientechnologies.orient.core.storage.OClusterEntryIterator;
+import com.orientechnologies.orient.core.storage.OPhysicalPosition;
+import com.orientechnologies.orient.core.storage.ORawBuffer;
+import com.orientechnologies.orient.core.storage.OStorage;
import com.orientechnologies.orient.core.version.ORecordVersion;
/**
@@ -179,12 +183,6 @@ public OClusterPosition getLastPosition() {
return OClusterPositionFactory.INSTANCE.valueOf(0);
}
- public void lock() {
- }
-
- public void unlock() {
- }
-
public int getId() {
return id;
}
@@ -0,0 +1,32 @@
+package com.orientechnologies.orient.client.remote;
+
+import java.io.IOException;
+
+import com.orientechnologies.orient.core.db.record.ridbag.sbtree.OBonsaiCollectionPointer;
+import com.orientechnologies.orient.core.index.sbtreebonsai.local.OBonsaiBucketPointer;
+import com.orientechnologies.orient.enterprise.channel.binary.OChannelBinary;
+
+public class OCollectionNetworkSerializer {
+ public static final OCollectionNetworkSerializer INSTANCE = new OCollectionNetworkSerializer();
+
+ public OCollectionNetworkSerializer() {
+ }
+
+ public OBonsaiCollectionPointer readCollectionPointer(OChannelBinary client) throws IOException {
+ final long fileId = client.readLong();
+ final OBonsaiBucketPointer rootPointer = readBonsaiBucketPointer(client);
+ return new OBonsaiCollectionPointer(fileId, rootPointer);
+ }
+
+ private OBonsaiBucketPointer readBonsaiBucketPointer(OChannelBinary client) throws IOException {
+ long pageIndex = client.readLong();
+ int pageOffset = client.readInt();
+ return new OBonsaiBucketPointer(pageIndex, pageOffset);
+ }
+
+ public void writeCollectionPointer(OChannelBinary client, OBonsaiCollectionPointer treePointer) throws IOException {
+ client.writeLong(treePointer.getFileId());
+ client.writeLong(treePointer.getRootPointer().getPageIndex());
+ client.writeInt(treePointer.getRootPointer().getPageOffset());
+ }
+}
Oops, something went wrong.

0 comments on commit 501dac7

Please sign in to comment.