8000 Merge branch '1.7-RC1' · githubcs/orientdb@501dac7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 501dac7

Browse files
lvcalvca
committed
Merge branch '1.7-RC1'
Conflicts: server/src/main/java/com/orientechnologies/orient/server/schedule/OSched uleHandler.java
2 parents bdb71f8 + 28de747 commit 501dac7

File tree

519 files changed

+25141
-14212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

519 files changed

+25141
-14212
lines changed

‎_base/base-build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<mkdir dir="${project.lib}"/>
4242
<javac destdir="${project.build}" debug="${project.is-debug}" debuglevel="${project.debug-level}"
4343
target="${project.target-comp}" source="${project.source-comp}" verbose="false"
44-
includeAntRuntime="false">
44+
includeAntRuntime="false" encoding="UTF-8">
4545
<src path="${project.src}"/>
4646
<src path="${project.src2}"/>
4747
<classpath refid="project.classpath"/>

‎_base/ide/eclipse-formatter.xml

Lines changed: 579 additions & 579 deletions
Large diffs are not rendered by default.

‎build.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<property environment="env"/>
66
<property name="vendor" value="NuvolaBase Ltd"/>
77
<property name="product" value="OrientDB"/>
8-
<property name="version" value="1.6.4"/>
8+
<property name="version" value="1.7-rc1"/>
99
<condition property="community.release" value="${releaseHome}/orientdb-community-${version}"
1010
else="../releases/orientdb-community-${version}">
1111
<isset property="releaseHome"/>
@@ -31,6 +31,7 @@
3131
<fileset dir="server" includes="build.xml"/>
3232
<fileset dir="distributed" includes="build.xml"/>
3333
<fileset dir="tools" includes="build.xml"/>
34+
<fileset dir="graphdb" includes="build.xml"/>
3435
<fileset dir="tests" includes="build.xml"/>
3536
</subant>
3637

@@ -128,12 +129,6 @@
128129

129130
<target name="install" depends="init">
130131
<delegate target="install"/>
131-
<subant target="install">
132-
<property name="global.lib" value="../${community.release}/lib"/>
133-
<property name="version" value="${version}"/>
134-
135-
<fileset dir="graphdb" includes="build.xml"/>
136-
</subant>
137132

138133
<copy todir="${community.release}/" flatten="true">
139134
<fileset dir="." includes="*.txt"/>
@@ -165,7 +160,7 @@
165160
<fileset dir="." includes="tools/config/*"/>
166161
<fileset dir="." includes="server/config/*"/>
167162
<fileset dir="." includes="distributed/config/*"/>
168-
<fileset dir="graphdb/config" includes="*.xml"/>
163+
<fileset dir="graphdb/config" includes="*.xml" erroronmissingdir="false"/>
169164
</copy>
170165

171166
<copy todir="${community.release}/lib" flatten="true">

‎client/pom.xml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>com.orientechnologies</groupId>
2626
<artifactId>orientdb-parent</artifactId>
27-
<version>1.6.4</version>
27+
<version>1.7-rc1</version>
2828
<relativePath>../</relativePath>
2929
</parent>
3030

@@ -35,6 +35,7 @@
3535
<properties>
3636
<osgi.import>*</osgi.import>
3737
<osgi.export>com.orientechnologies.orient.client.*</osgi.export>
38+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3839
</properties>
3940

4041
<dependencies>
@@ -43,6 +44,19 @@
4344
<artifactId>orientdb-enterprise</artifactId>
4445
<version>${project.version}</version>
4546
</dependency>
47+
48+
<dependency>
49+
<groupId>org.testng</groupId>
50+
<artifactId>testng</artifactId>
51+
<version>5.14.1</version>
52+
<scope>test</scope>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.mockito</groupId>
56+
<artifactId>mockito-all</artifactId>
57+
<version>1.9.5</version>
58+
<scope>test</scope>
59+
</dependency>
4660
</dependencies>
4761

4862
</project>

‎client/src/main/java/com/orientechnologies/orient/client/db/ODatabaseHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public static File getConfigurationFile() {
102102
return getConfigurationFile(null);
103103
}
104104

105-
protected static String getServerRootPassword() throws IOException {
105+
public static String getServerRootPassword() throws IOException {
106106
return getServerRootPassword("server");
107107
}
108108

‎client/src/main/java/com/orientechnologies/orient/client/remote/OClusterRemote.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121
import com.orientechnologies.orient.core.config.OStorageClusterConfiguration;
2222
import com.orientechnologies.orient.core.id.OClusterPosition;
2323
import com.orientechnologies.orient.core.id.OClusterPositionFactory;
24-
import com.orientechnologies.orient.core.storage.*;
24+
import com.orientechnologies.orient.core.storage.OCluster;
25+
import com.orientechnologies.orient.core.storage.OClusterEntryIterator;
26+
import com.orientechnologies.orient.core.storage.OPhysicalPosition;
27+
import com.orientechnologies.orient.core.storage.ORawBuffer;
28+
import com.orientechnologies.orient.core.storage.OStorage;
2529
import com.orientechnologies.orient.core.version.ORecordVersion;
2630

2731
/**
@@ -179,12 +183,6 @@ public OClusterPosition getLastPosition() {
179183
return OClusterPositionFactory.INSTANCE.valueOf(0);
180184
}
181185

182-
public void lock() {
183-
}
184-
185-
public void unlock() {
186-
}
187-
188186
public int getId() {
189187
return id;
190188
}

‎client/src/main/java/com/orientechnologies/orient/client/remote/OCollectionNetworkSerializer.java

Lines changed: 32 additions & 0 deletions
+
final long fileId = client.readLong();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.orientechnologies.orient.client.remote;
2+
3+
import java.io.IOException;
4+
5+
import com.orientechnologies.orient.core.db.record.ridbag.sbtree.OBonsaiCollectionPointer;
6+
import com.orientechnologies.orient.core.index.sbtreebonsai.local.OBonsaiBucketPointer;
7+
import com.orientechnologies.orient.enterprise.channel.binary.OChannelBinary;
8+
9+
public class OCollectionNetworkSerializer {
10+
public static final OCollectionNetworkSerializer INSTANCE = new OCollectionNetworkSerializer();
11+
12+
public OCollectionNetworkSerializer() {
13+
}
14+
15+
public OBonsaiCollectionPointer readCollectionPointer(OChannelBinary client) throws IOException {
16
17+
final OBonsaiBucketPointer rootPointer = readBonsaiBucketPointer(client);
18+
return new OBonsaiCollectionPointer(fileId, rootPointer);
19+
}
20+
21+
private OBonsaiBucketPointer readBonsaiBucketPointer(OChannelBinary client) throws IOException {
22+
long pageIndex = client.readLong();
23+
int pageOffset = client.readInt();
24+
return new OBonsaiBucketPointer(pageIndex, pageOffset);
25+
}
26+
27+
public void writeCollectionPointer(OChannelBinary client, OBonsaiCollectionPointer treePointer) throws IOException {
28+
client.writeLong(treePointer.getFileId());
29+
client.writeLong(treePointer.getRootPointer().getPageIndex());
30+
client.writeInt(treePointer.getRootPointer().getPageOffset());
31+
}
32+
}

0 commit comments

Comments
 (0)
0