Skip to content

Commit ed33439

Browse files
andrii0lomakinandrii0lomakin
committed
Merge remote-tracking branch 'origin/hotfix-1.5.1' into wow-cache
Conflicts: core/src/main/java/com/orientechnologies/orient/core/index/hashindex/local/OLocalHashTable.java
2 parents 6d0a6ae + 5a893a6 commit ed33439

46 files changed

Lines changed: 573 additions & 289 deletions

File tree

Some content is hidden

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

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The most common reason applications scale out badly is, very often, the database
1818

1919
## I can't believe it! Why is it so fast?
2020

21-
OrientDB has been designed to be very fast. It inherits the best features and concepts from Object Databases, Graph DBMS and modern [NoSQL](http://en.wikipedia.org/wiki/NoSQL) engines. Furthermore it uses the own **RB+Tree** algorithm as a mix of [Red-Black Tree](http://en.wikipedia.org/wiki/Red-black_tree) and [B+Tree](http://en.wikipedia.org/wiki/B%2Btree). RB+Tree consumes about half memory of the [Red-Black Tree](http://en.wikipedia.org/wiki/Red-black_tree) implementation mantaining the original speed while it balances the tree on insertion/update. Furthermore the RB+Tree allows fast retrieving and storing of nodes in persistent way.
21+
OrientDB has been designed to be very fast. It inherits the best features and concepts from Object Databases, Graph DBMS and modern [NoSQL](http://en.wikipedia.org/wiki/NoSQL) engines. Furthermore it uses the own **MVRB-Tree** algorithm as a mix of [Red-Black Tree](http://en.wikipedia.org/wiki/Red-black_tree) and [B+Tree](http://en.wikipedia.org/wiki/B%2Btree). MVRB-Tree consumes about half memory of the [Red-Black Tree](http://en.wikipedia.org/wiki/Red-black_tree) implementation mantaining the original speed while it balances the tree on insertion/update. Furthermore the MVRB-Tree allows fast retrieving and storing of nodes in persistent way.
2222

2323
## Why yet another NoSQL?
2424

‎build.xml‎

Lines changed: 26 additions & 26 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.5.0-SNAPSHOT"/>
8+
<property name="version" value="1.5.1-SNAPSHOT"/>
99
<condition property="global.release" value="${releaseHome}/orientdb-${version}"
1010
else="../releases/orientdb-${version}">
1111
<isset property="releaseHome"/>
@@ -52,31 +52,30 @@
5252
</macrodef>
5353

5454
<target name="init">
55-
<echo> . </echo>
56-
<echo> .` ` </echo>
57-
<echo> , `:. </echo>
58-
<echo> `,` ,:` </echo>
59-
<echo> .,. :,, </echo>
60-
<echo> .,, ,,, </echo>
61-
<echo> . .,.::::: ```` </echo>
62-
<echo> ,` .::,,,,::.,,,,,,`;; .: </echo>
63-
<echo> `,. ::,,,,,,,:.,,.` ` .: </echo>
64-
<echo> ,,:,:,,,,,,,,::. ` ` `` .: </echo>
65-
<echo> ,,:.,,,,,,,,,: `::, ,, ::,::` : :,::` :::: </echo>
66-
<echo> ,:,,,,,,,,,,::,: ,, :. : :: : .: </echo>
67-
<echo> :,,,,,,,,,,:,:: ,, : : : : .: </echo>
68-
<echo> ` :,,,,,,,,,,:,::, ,, .:::::::: : : .: </echo>
69-
<echo> `,...,,:,,,,,,,,,: .:,. ,, ,, : : .: </echo>
70-
<echo> .,,,,::,,,,,,,: `: , ,, : ` : : .: </echo>
71-
<echo> ...,::,,,,::.. `: .,, :, : : : .: </echo>
72-
<echo> ,::::,,,. `: ,, ::::: : : .: </echo>
73-
<echo> ,,:` `,,. </echo>
74-
<echo> ,,, .,` </echo>
75-
<echo> ,,. `, D A T A B A S E </echo>
76-
<echo> `` `. </echo>
77-
<echo> `` </echo>
78-
<echo> ` </echo>
79-
<echo> </echo>
55+
<echo> . </echo>
56+
<echo> .` ` </echo>
57+
<echo> , `:. </echo>
58+
<echo> `,` ,:` </echo>
59+
<echo> .,. :,, </echo>
60+
<echo> .,, ,,, </echo>
61+
<echo> . .,.::::: ```` ::::::::: :::::::::</echo>
62+
<echo> ,` .::,,,,::.,,,,,,`;; .: :::::::::: ::: :::</echo>
63+
<echo> `,. ::,,,,,,,:.,,.` ` .: ::: ::: ::: :::</echo>
64+
<echo> ,,:,:,,,,,,,,::. ` ` `` .: ::: ::: ::: :::</echo>
65+
<echo> ,,:.,,,,,,,,,: `::, ,, ::,::` : :,::` :::: ::: ::: ::: :::</echo>
66+
<echo> ,:,,,,,,,,,,::,: ,, :. : :: : .: ::: ::: :::::::</echo>
67+
<echo> :,,,,,,,,,,:,:: ,, : : : : .: ::: ::: :::::::::</echo>
68+
<echo> ` :,,,,,,,,,,:,::, ,, .:::::::: : : .: ::: ::: ::: :::</echo>
69+
<echo> `,...,,:,,,,,,,,,: .:,. ,, ,, : : .: ::: ::: ::: :::</echo>
70+
<echo> .,,,,::,,,,,,,: `: , ,, : ` : : .: ::: ::: ::: :::</echo>
71+
<echo> ...,::,,,,::.. `: .,, :, : : : .: ::::::::::: ::: :::</echo>
72+
<echo> ,::::,,,. `: ,, ::::: : : .: ::::::::: ::::::::::</echo>
73+
<echo> ,,:` `,,. </echo>
74+
<echo> ,,, .,` </echo>
75+
<echo> ,,. `, GRAPH DATABASE </echo>
76+
<echo> `` `. </echo>
77+
<echo> `` </echo>
78+
<echo> ` </echo>
8079

8180
<mkdir dir="${global.release}"/>
8281
<mkdir dir="${db.release}"/>
@@ -145,6 +144,7 @@
145144
<copy todir="${db.release}" file="license.txt"/>
146145
<copy tofile="${db.release}/readme.txt" file="readme.txt"/>
147146
<copy tofile="${db.release}/history.txt" file="history.txt"/>
147+
<copy tofile="${db.release}/upgrade.txt" file="upgrade.txt"/>
148148

149149
<copy todir="${db.release}/bin/" flatten="true">
150150
<fileset dir="."

‎client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.orientechnologies</groupId>
99
<artifactId>orientdb-parent</artifactId>
10-
<version>1.5.0-SNAPSHOT</version>
10+
<version>1.5.1-SNAPSHOT</version>
1111
<relativePath>../</relativePath>
1212
</parent>
1313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public class OStorageRemote extends OStorageAbstract implements OStorageProxy {
116116
private int minPool;
117117
private int maxPool;
118118
private final boolean debug = false;
119-
private ODocument clusterConfiguration = new ODocument();
119+
private final ODocument clusterConfiguration = new ODocument();
120120
private ORemoteServerEventListener asynchEventListener;
121121
private String connectionDbType;
122122
private String connectionUserName;

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

100644100755
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@ public void onRequest(final byte iRequestCode, final Object obj) {
2020
else if (iRequestCode == OChannelBinaryProtocol.REQUEST_PUSH_DISTRIB_CONFIG) {
2121
storage.updateClusterConfiguration((byte[]) obj);
2222

23-
if (OLogManager.instance().isDebugEnabled())
24-
OLogManager.instance().debug(this, "Received new cluster configuration: %s", storage.getClusterConfiguration().toJSON(""));
23+
if (OLogManager.instance().isDebugEnabled()) {
24+
synchronized (storage.getClusterConfiguration()) {
25+
OLogManager.instance()
26+
.debug(this, "Received new cluster configuration: %s", storage.getClusterConfiguration().toJSON(""));
27+
}
28+
}
2529
}
2630
}
2731

‎commons/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.orientechnologies</groupId>
99
<artifactId>orientdb-parent</artifactId>
10-
<version>1.5.0-SNAPSHOT</version>
10+
<version>1.5.1-SNAPSHOT</version>
1111
<relativePath>../</relativePath>
1212
</parent>
1313

‎commons/src/main/java/com/orientechnologies/common/collection/OMultiValue.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ public class OMultiValue {
4848
* @return true if it's an array, a collection or a map, otherwise false
4949
*/
5050
public static boolean isMultiValue(final Class<?> iType) {
51-
return (iType.isArray() || Collection.class.isAssignableFrom(iType) || Map.class.isAssignableFrom(iType));
51+
return (iType.isArray() || Collection.class.isAssignableFrom(iType) || Map.class.isAssignableFrom(iType) || OMultiCollectionIterator.class
52+
.isAssignableFrom(iType));
5253
}
5354

5455
/**

‎core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.orientechnologies</groupId>
99
<artifactId>orientdb-parent</artifactId>
10-
<version>1.5.0-SNAPSHOT</version>
10+
<version>1.5.1-SNAPSHOT</version>
1111
<relativePath>../</relativePath>
1212
</parent>
1313

‎core/src/main/java/com/orientechnologies/orient/core/OConstants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.orientechnologies.orient.core;
1717

1818
public class OConstants {
19-
public static final String ORIENT_VERSION = "1.5.0-SNAPSHOT";
19+
public static final String ORIENT_VERSION = "1.5.1-SNAPSHOT";
2020
public static final String ORIENT_URL = "www.orientechnologies.com";
2121

2222
public static String getVersion() {

‎core/src/main/java/com/orientechnologies/orient/core/config/OGlobalConfiguration.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,10 @@ public void change(final Object iCurrentValue, final Object iNewValue) {
184184
TX_USE_LOG("tx.useLog", "Transactions use log file to store temporary data to be rolled back in case of crash", Boolean.class,
185185
true),
186186

187+
TX_AUTO_RETRY("tx.autoRetry",
188+
"Maximum number of automatic retry if some resource has been locked in the middle of the transaction (Timeout exception)",
189+
Integer.class, 10),
190+
187191
TX_LOG_TYPE("tx.log.fileType", "File type to handle transaction logs: mmap or classic", String.class, "classic"),
188192

189193
TX_LOG_SYNCH(

0 commit comments

Comments
 (0)