Skip to content

Commit

Permalink
refactor: removed usage of ODatabaseDocumentTx from legacy benchmarks
Browse files Browse the repository at this point in the history
  • Loading branch information
tglman committed Jan 27, 2025
1 parent 3cb0619 commit 3a5df47
Show file tree
Hide file tree
Showing 23 changed files with 226 additions and 281 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package com.orientechnologies.orient.test.database.base;

import com.orientechnologies.orient.core.db.ODatabaseSession;
import com.orientechnologies.orient.core.db.OrientDB;
import com.orientechnologies.orient.core.db.OrientDBConfig;
import com.orientechnologies.orient.core.util.OURLConnection;
import com.orientechnologies.orient.core.util.OURLHelper;

public abstract class OrientMonoThreadDBTest extends OrientMonoThreadTest {
protected OrientDB context;
protected ODatabaseSession database;
protected OURLConnection conn;

public OrientMonoThreadDBTest(int iCycles) {
super(iCycles);
}

@Override
public void init() {
String url = System.getProperty("url");
conn = OURLHelper.parse(url);
context =
new OrientDB(
conn.getType() + ":" + conn.getPath(), "root", "root", OrientDBConfig.defaultConfig());
database = context.open(conn.getDbName(), "admin", "admin");
}

public void dropAndCreate() {
String dbName = conn.getDbName();
if (context.exists(dbName)) {
context.drop(dbName);
}

context.execute(
"create database ? plocal users(admin identified by 'admin' role admin)", dbName);

database = context.open(conn.getDbName(), "admin", "admin");
}

@Override
public void deinit() {
if (database != null) database.close();
context.close();
super.deinit();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
* Copyright 2010-2016 OrientDB LTD (http://orientdb.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.orientechnologies.orient.test.database.base;

import com.orientechnologies.common.test.SpeedTestMultiThreads;
import com.orientechnologies.common.test.SpeedTestThread;
import com.orientechnologies.orient.core.db.ODatabaseSession;
import com.orientechnologies.orient.core.db.OrientDB;
import com.orientechnologies.orient.core.db.OrientDBConfig;
import com.orientechnologies.orient.core.util.OURLConnection;
import com.orientechnologies.orient.core.util.OURLHelper;

public abstract class OrientMultiThreadDBTest extends SpeedTestMultiThreads {
private OrientDB context;
private OURLConnection conn;

public OrientMultiThreadDBTest(
int iCycles, int iThreads, Class<? extends SpeedTestThread> iThreadClass) {
super(iCycles, iThreads, iThreadClass);
}

@Override
public void init() throws Exception {
super.init();
String url = System.getProperty("url");
conn = OURLHelper.parse(url);
context =
new OrientDB(
conn.getType() + ":" + conn.getPath(), "root", "root", OrientDBConfig.defaultConfig());
}

public void dropAndCreate() {
String dbName = conn.getDbName();
if (context.exists(dbName)) {
context.drop(dbName);
}

context.execute(
"create database ? plocal users(admin identified by 'admin' role admin)", dbName);
}

public ODatabaseSession openDB() {
return context.open(conn.getDbName(), "admin", "admin");
}

public OrientDB getContext() {
return context;
}

@Override
public void deinit() throws Exception {
context.close();
super.deinit();
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,13 @@
package com.orientechnologies.orient.test.database.speed;

import com.orientechnologies.orient.core.Orient;
import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.orientechnologies.orient.core.index.OIndex;
import com.orientechnologies.orient.core.record.impl.ODocument;
import com.orientechnologies.orient.test.database.base.OrientMonoThreadTest;
import com.orientechnologies.orient.test.database.base.OrientMonoThreadDBTest;
import org.junit.Ignore;

@Ignore
public class DictionaryPutDocumentSpeedTest extends OrientMonoThreadTest {
private ODatabaseDocument database;
public class DictionaryPutDocumentSpeedTest extends OrientMonoThreadDBTest {
private ODocument record;
private long startNum;

Expand All @@ -37,10 +34,12 @@ public static void main(String[] iArgs) throws InstantiationException, IllegalAc

public DictionaryPutDocumentSpeedTest() throws InstantiationException, IllegalAccessException {
super(1000000);
record = new ODocument();
}

String url = System.getProperty("url");

database = new ODatabaseDocumentTx(url).open("admin", "admin");
@Override
public void init() {
super.init();
for (OIndex idx : database.getMetadata().getSchema().getClass("Account").getIndexes()) {
idx.delete();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
package com.orientechnologies.orient.test.database.speed;

import com.orientechnologies.orient.core.Orient;
import com.orientechnologies.orient.core.db.OrientDB;
import com.orientechnologies.orient.core.db.OrientDBConfig;
import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.orientechnologies.orient.core.record.impl.ODocument;
import com.orientechnologies.orient.core.tx.OTransaction.TXTYPE;
import com.orientechnologies.orient.core.util.OURLConnection;
import com.orientechnologies.orient.core.util.OURLHelper;

public class FullTextIndexerTest {
private static final int DOCUMENTS = 1000;

public static void main(String[] iArgs) throws InstantiationException, IllegalAccessException {
Orient.instance().getProfiler().startRecording();
String url = System.getProperty("url");
OURLConnection conn = OURLHelper.parse(url);
OrientDB context =
new OrientDB(
conn.getType() + ":" + conn.getPath(), "root", "root", OrientDBConfig.defaultConfig());

final ODatabaseDocument database =
new ODatabaseDocumentTx(System.getProperty("url")).open("admin", "admin");
final ODatabaseDocument database = context.open(conn.getDbName(), "admin", "admin");

database.begin(TXTYPE.NOTX);

Expand Down Expand Up @@ -76,5 +83,6 @@ public static void main(String[] iArgs) throws InstantiationException, IllegalAc
"\nIndexed " + DOCUMENTS + " documents in " + ((lap - time) / 1000f) + " sec.");

database.close();
context.close();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
import com.orientechnologies.orient.core.config.OGlobalConfiguration;
import com.orientechnologies.orient.core.db.ODatabase;
import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
import com.orientechnologies.orient.core.db.OrientDB;
import com.orientechnologies.orient.core.db.OrientDBConfig;
import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.orientechnologies.orient.core.id.ORID;
import com.orientechnologies.orient.core.metadata.schema.OClass;
import com.orientechnologies.orient.core.metadata.schema.OSchema;
Expand All @@ -31,15 +32,16 @@ public class GiantFileTest {

public static void main(final String[] args) throws Exception {
OGlobalConfiguration.DISK_CACHE_SIZE.setValue(1024);
try {
db = new ODatabaseDocumentTx("plocal:" + DATABASE_NAME);
if (db.exists() && RECREATE_DATABASE) {
db.open("admin", "admin");
db.drop();
System.out.println("Dropped database.");
try (OrientDB context = new OrientDB("embedded:./", OrientDBConfig.defaultConfig())) {

if (context.exists(DATABASE_NAME) && RECREATE_DATABASE) {
context.drop(DATABASE_NAME);
}
if (!db.exists()) {
db.create();
if (!context.exists(DATABASE_NAME)) {
context.execute(
"create database ? plocal users(admin identified by 'admin' role admin)",
DATABASE_NAME);
db = context.open(DATABASE_NAME, "admin", "admin");
System.out.println("Created database.");

final OSchema schema = db.getMetadata().getSchema();
Expand All @@ -63,7 +65,7 @@ public static void main(final String[] args) throws Exception {
.setNotNull(false);
System.out.println("Created schema.");
} else {
db.open("admin", "admin");
db = context.open(DATABASE_NAME, "admin", "admin");
}

final File giantFile = new File("giantFile.bin");
Expand Down Expand Up @@ -92,7 +94,6 @@ public static void main(final String[] args) throws Exception {
final long storeFileMs = System.currentTimeMillis() - storeFileStartTime;

System.out.printf("Finished storing giant file in %f seconds.\n", (float) storeFileMs / 1000);
} finally {
db.close();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,14 @@
import com.orientechnologies.orient.core.Orient;
import com.orientechnologies.orient.core.config.OGlobalConfiguration;
import com.orientechnologies.orient.core.db.ODatabase.OPERATION_MODE;
import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.orientechnologies.orient.core.record.impl.ODocument;
import com.orientechnologies.orient.core.tx.OTransaction.TXTYPE;
import com.orientechnologies.orient.test.database.base.OrientMonoThreadTest;
import com.orientechnologies.orient.test.database.base.OrientMonoThreadDBTest;
import java.util.Date;
import org.junit.Ignore;

@Ignore
public class LocalCreateAsynchDocumentSpeedTest extends OrientMonoThreadTest {
private ODatabaseDocument database;
public class LocalCreateAsynchDocumentSpeedTest extends OrientMonoThreadDBTest {
private ODocument record;
private Date date = new Date();

Expand All @@ -47,8 +44,8 @@ public void init() {
Orient.instance().getProfiler().startRecording();

OGlobalConfiguration.NETWORK_SOCKET_BUFFER_SIZE.setValue(10000000);
super.init();

database = new ODatabaseDocumentTx(System.getProperty("url")).open("admin", "admin");
record = database.newInstance();

database.begin(TXTYPE.NOTX);
Expand All @@ -74,7 +71,6 @@ public void cycle() {
public void deinit() {
System.out.println(Orient.instance().getProfiler().dump());

if (database != null) database.close();
super.deinit();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,14 @@
package com.orientechnologies.orient.test.database.speed;

import com.orientechnologies.orient.core.Orient;
import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
import com.orientechnologies.orient.core.record.impl.ORecordBytes;
import com.orientechnologies.orient.core.tx.OTransaction.TXTYPE;
import com.orientechnologies.orient.test.database.base.OrientMonoThreadTest;
import com.orientechnologies.orient.test.database.base.OrientMonoThreadDBTest;
import java.util.Random;
import org.junit.Ignore;

@Ignore
public class LocalCreateBinarySpeedTest extends OrientMonoThreadTest {
private ODatabaseDocument database;
public class LocalCreateBinarySpeedTest extends OrientMonoThreadDBTest {
private ORecordBytes record;
private static final int RECORD_SIZE = 512;
private byte[] recordContent;
Expand All @@ -42,9 +39,9 @@ public LocalCreateBinarySpeedTest() throws InstantiationException, IllegalAccess

@Override
public void init() {
super.init();
Orient.instance().getProfiler().startRecording();

database = new ODatabaseDocumentTx(System.getProperty("url")).open("admin", "admin");
record = new ORecordBytes();

database.begin(TXTYPE.NOTX);
Expand All @@ -59,10 +56,4 @@ public void cycle() {

if (data.getCyclesDone() == data.getCycles() - 1) database.commit();
}

@Override
public void deinit() {
if (database != null) database.close();
super.deinit();
}
}
Loading

0 comments on commit 3a5df47

Please sign in to comment.