diff --git a/CODEOWNERS b/CODEOWNERS deleted file mode 100644 index c8bb53224ffd4dd0e8d9a0859782311044a933d0..0000000000000000000000000000000000000000 --- a/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -# * @qishipengqsp \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 135d982b73ebf65fb8fe77ec85f573094b24ee01..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,111 +0,0 @@ -![LDBC Logo](ldbc-logo.png) - -# LDBC FinBench Driver - -![Build status](https://github.com/ldbc/ldbc_finbench_driver/actions/workflows/ci.yml/badge.svg?branch=main) - -The LDBC FinBench Driver is a powerful tool designed for benchmarking the performance of graph databases. This is the alpha version of the FinBench driver, currently undergoing alpha testing. - -## 1. Configurations - -The Driver initiates by reading the configuration file. The default configuration file path for DummyDB is `src/main/resources/example/ldbc_finbench_driver_dummy.properties`. - -### 1.1 SUT Defined - -If required, the System Under Test (SUT) can customize the configuration parameters to connect to the database or read the query file. This can include the request host, port, path, etc. - -```shell -host=localhost -port=9091 -user=admin -pass=123456 -path=cypher/ -``` - -### 1.2 DB - -For a new implementation of the SUT, update this configuration parameter accordingly. - -```shell -db=org.ldbcouncil.finbench.impls.dummy.DummyDb -``` - -### 1.3 Params - -Please update based on your parameter path. The `parameters_dir` is the `ComplexRead` parameter path, and `updates_dir` is the `Write` and `ReadWrite` incremental data path. - -```shell -ldbc.finbench.transaction.queries.parameters_dir=src/main/resources/example/data/read_params -ldbc.finbench.transaction.queries.updates_dir=src/main/resources/example/data/incremental_data -``` - -### 1.4 Mode - -The driver operates in three modes: - -- CREATE_VALIDATION -- VALIDATE_DATABASE -- EXECUTE_BENCHMARK - -#### CREATE_VALIDATION - -With `CREATE_VALIDATION` mode, you create a database result. `validation_parameters_size` denotes the number of results created, while `validate_database` refers to the file where the created results are stored. - -```shell -mode=CREATE_VALIDATION -validation_parameters_size=100 -validate_database=validation_params.csv -``` - -#### VALIDATE_DATABASE - -`VALIDATE_DATABASE` mode allows you to verify the SUT. The `validate_database` is the result created by `CREATE_VALIDATION` mode. - -```shell -mode=VALIDATE_DATABASE -validate_database=validation_params.csv -``` - -#### EXECUTE_BENCHMARK - -Perform the performance test with `EXECUTE_BENCHMARK` mode. Here are some crucial configuration parameters that need adjustment when operating the driver: - -1. **thread_count**: Represents the number of concurrent requests that the driver can handle, corresponding to the number of active threads running simultaneously within the driver. -2. **time_compression_ratio**: Controls the intensity of the driver's workload. A lower value yields a higher workload in a shorter timeframe. -3. **ignore_scheduled_start_times**: Determines whether the driver should follow the scheduled timings for sending requests. If set to true, the driver sends requests as soon as they are prepared, regardless of the schedule. -4. **warmup**: Denotes the number of preliminary test items processed before the actual benchmarking begins. -5. **operation_count**: Sets the number of test items executed during the actual benchmarking phase after the warm-up. - -```shell -mode=EXECUTE_BENCHMARK -thread_count=1 -time_compression_ratio=0.001 -ignore_scheduled_start_times=false -warmup=5 -operation_count=10000 -``` - -## 2. Quick Start - -To get started, clone the repository and build it with Maven: - -```bash -git clone https://github.com/ldbc/ldbc_finbench_driver.git -cd ldbc_finbench_driver -mvn clean package -DskipTests -``` - -For a quick trial of the driver, utilize the DummyDB shipped with it by running the following command: - -```bash -java -cp target/driver-0.2.0-alpha.jar org.ldbcouncil.finbench.driver.driver.Driver -P src/main/resources/example/ldbc_finbench_driver_dummy.properties -``` - -## 3. Reference - -- FinBench Specification: https://github.com/ldbc/ldbc_finbench_docs -- FinBench DataGen: https://github.com/ldbc/ldbc_finbench_datagen -- FinBench Driver: https://github.com/ldbc/ldbc_finbench_driver -- FinBench Transaction Reference Implementation: https://github.com/ldbc/ldbc_finbench_transaction_impls - -Please visit these links for further documentation and related resources. \ No newline at end of file diff --git a/code_of_conduct.md b/code_of_conduct.md deleted file mode 100644 index a08cb149cb0f7582e6ea29e49df4e930696dffd7..0000000000000000000000000000000000000000 --- a/code_of_conduct.md +++ /dev/null @@ -1 +0,0 @@ -For our code of conduct, see: https://github.com/ldbc/community/blob/main/code_of_conduct.md diff --git a/contributing.md b/contributing.md deleted file mode 100644 index c504a9f3c125a261772d01181d6db973da219760..0000000000000000000000000000000000000000 --- a/contributing.md +++ /dev/null @@ -1 +0,0 @@ -For our contributor's guide, see: https://github.com/ldbc/community/blob/main/contributing.md \ No newline at end of file diff --git a/ldbc-logo.png b/ldbc-logo.png deleted file mode 100644 index 969d58841ab0d2571d819bbaf042ee9cea5a0c89..0000000000000000000000000000000000000000 Binary files a/ldbc-logo.png and /dev/null differ diff --git a/pom.xml b/pom.xml index d229439e79c02c22797f81f9c388a2d9aa76ea05..cd5dc08cab058800bbe553b9f3622b1607b287fb 100644 --- a/pom.xml +++ b/pom.xml @@ -3,12 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.ldbcouncil.finbench + org.graphybench.driver driver 0.2.0-alpha jar - LDBC FinBench Driver + GraphyBench Driver @@ -147,7 +147,7 @@ maven-deploy-plugin 2.8.1 - internal.repo::default::file://${project.build.directory}/ldbc_finbench_mvn + internal.repo::default::file://${project.build.directory}/graphybench_mvn @@ -265,12 +265,4 @@ - - - - - - - - diff --git a/scripts/package-mvn-artifacts.sh b/scripts/package-mvn-artifacts.sh index 8641c78786f55862e1aa3ac76ea152f9dd42be4d..61429da9d35d98df733957e0a8d58260625f8222 100644 --- a/scripts/package-mvn-artifacts.sh +++ b/scripts/package-mvn-artifacts.sh @@ -7,4 +7,4 @@ cd "$(pwd)" git clean -xdf . mvn clean deploy -cp -r target/ldbc_finbench_mvn/* ../ldbc_finbench_mvn/ +cp -r target/graphybench_mvn/* ../graphybench_mvn/ diff --git a/src/main/java/org/ldbcouncil/finbench/driver/ChildOperationGenerator.java b/src/main/java/org/graphybench/driver/driver/ChildOperationGenerator.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/ChildOperationGenerator.java rename to src/main/java/org/graphybench/driver/driver/ChildOperationGenerator.java index 8fc60df4e356f68305f38e5a7dac8f9447b383ca..ee05a5b9655455d148f2baa13665d4c19d79bbb2 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/ChildOperationGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/ChildOperationGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; public interface ChildOperationGenerator { double initialState(); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/Db.java b/src/main/java/org/graphybench/driver/driver/Db.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/Db.java rename to src/main/java/org/graphybench/driver/driver/Db.java index c3fd85480ab3e42bfee0b231e08805466d191db8..218efefc8ff9e3d10fc25431acac337b9c2ed097 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/Db.java +++ b/src/main/java/org/graphybench/driver/driver/Db.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; import static java.lang.String.format; @@ -24,8 +24,8 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; -import org.ldbcouncil.finbench.driver.log.LoggingService; -import org.ldbcouncil.finbench.driver.util.ClassLoaderHelper; +import org.graphybench.driver.driver.log.LoggingService; +import org.graphybench.driver.driver.util.ClassLoaderHelper; public abstract class Db implements Closeable { private boolean isInitialized = false; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/DbConnectionState.java b/src/main/java/org/graphybench/driver/driver/DbConnectionState.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/DbConnectionState.java rename to src/main/java/org/graphybench/driver/driver/DbConnectionState.java index 60a04145fd44f35f790077acce98dcb7b9720402..10c9b0fbb71df95e88f27448fc776a7ea552fc36 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/DbConnectionState.java +++ b/src/main/java/org/graphybench/driver/driver/DbConnectionState.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; import java.io.Closeable; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/DbException.java b/src/main/java/org/graphybench/driver/driver/DbException.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/DbException.java rename to src/main/java/org/graphybench/driver/driver/DbException.java index 997bff6ccf0ff78eaf5486e1f07d0f2cacc411f0..bffa638fa98215e98074ec0b22d29a06bf193a16 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/DbException.java +++ b/src/main/java/org/graphybench/driver/driver/DbException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; public class DbException extends Exception { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/InstantiatingOperationHandlerRunnerFactory.java b/src/main/java/org/graphybench/driver/driver/InstantiatingOperationHandlerRunnerFactory.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/InstantiatingOperationHandlerRunnerFactory.java rename to src/main/java/org/graphybench/driver/driver/InstantiatingOperationHandlerRunnerFactory.java index d48a3ee1ca62396093d442a12d9afa72a854ee9d..8dd934cc79709fb61641095d32119a3ca7da5573 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/InstantiatingOperationHandlerRunnerFactory.java +++ b/src/main/java/org/graphybench/driver/driver/InstantiatingOperationHandlerRunnerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; import stormpot.Poolable; import stormpot.Slot; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/Operation.java b/src/main/java/org/graphybench/driver/driver/Operation.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/Operation.java rename to src/main/java/org/graphybench/driver/driver/Operation.java index 99debe0b0b5cf2b9260daeedf279ea25f186a1e6..07131f75f02eecfabadda0c0c5014d03b1ac414a 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/Operation.java +++ b/src/main/java/org/graphybench/driver/driver/Operation.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; import java.io.IOException; import java.util.Map; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.temporal.TemporalUtil; /** * Describes Operation performed by the driver, e.g. queries. diff --git a/src/main/java/org/ldbcouncil/finbench/driver/OperationException.java b/src/main/java/org/graphybench/driver/driver/OperationException.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/OperationException.java rename to src/main/java/org/graphybench/driver/driver/OperationException.java index 4e429ffa4d541ea95acc1c4ac000ae6eea11d3c4..13837b45ff4f5e39e7fe1344ac50c5dbae9489cc 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/OperationException.java +++ b/src/main/java/org/graphybench/driver/driver/OperationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; public class OperationException extends Exception { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/OperationHandler.java b/src/main/java/org/graphybench/driver/driver/OperationHandler.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/OperationHandler.java rename to src/main/java/org/graphybench/driver/driver/OperationHandler.java index 1a71365df61022f7e3e17abb6cb058b3747ad9d5..fdb05440aa80610d57642103db678cfb126af673 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/OperationHandler.java +++ b/src/main/java/org/graphybench/driver/driver/OperationHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; public interface OperationHandler { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/OperationHandlerRunnableContext.java b/src/main/java/org/graphybench/driver/driver/OperationHandlerRunnableContext.java similarity index 92% rename from src/main/java/org/ldbcouncil/finbench/driver/OperationHandlerRunnableContext.java rename to src/main/java/org/graphybench/driver/driver/OperationHandlerRunnableContext.java index b27f6eec39ba6395a182cf450c27a4be1ea5a02d..7c65b2f7788bea3f18cd5e21440adb703a3e8725 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/OperationHandlerRunnableContext.java +++ b/src/main/java/org/graphybench/driver/driver/OperationHandlerRunnableContext.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; import static java.lang.String.format; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeWriter; -import org.ldbcouncil.finbench.driver.runtime.metrics.MetricsCollectionException; -import org.ldbcouncil.finbench.driver.runtime.metrics.MetricsService; -import org.ldbcouncil.finbench.driver.runtime.scheduling.Spinner; -import org.ldbcouncil.finbench.driver.runtime.scheduling.SpinnerCheck; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeWriter; +import org.graphybench.driver.driver.runtime.metrics.MetricsCollectionException; +import org.graphybench.driver.driver.runtime.metrics.MetricsService; +import org.graphybench.driver.driver.runtime.scheduling.Spinner; +import org.graphybench.driver.driver.runtime.scheduling.SpinnerCheck; +import org.graphybench.driver.driver.temporal.TimeSource; import stormpot.Poolable; import stormpot.Slot; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/OperationHandlerRunnerFactory.java b/src/main/java/org/graphybench/driver/driver/OperationHandlerRunnerFactory.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/OperationHandlerRunnerFactory.java rename to src/main/java/org/graphybench/driver/driver/OperationHandlerRunnerFactory.java index 466500e08980cfe39a8500b261ccb4b8862b19c5..cb0c8f1f4170cc47eba0fae4428c61092e548d75 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/OperationHandlerRunnerFactory.java +++ b/src/main/java/org/graphybench/driver/driver/OperationHandlerRunnerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; public interface OperationHandlerRunnerFactory { OperationHandlerRunnableContext newOperationHandlerRunner() throws OperationException; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/PoolingOperationHandlerRunnerFactory.java b/src/main/java/org/graphybench/driver/driver/PoolingOperationHandlerRunnerFactory.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/PoolingOperationHandlerRunnerFactory.java rename to src/main/java/org/graphybench/driver/driver/PoolingOperationHandlerRunnerFactory.java index 547ea8d4754738f26e48edb6d1e030b89fbf2b20..9309bd9f5a15b5e6aef5903d3089a29dffc1e86e 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/PoolingOperationHandlerRunnerFactory.java +++ b/src/main/java/org/graphybench/driver/driver/PoolingOperationHandlerRunnerFactory.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; import static java.lang.String.format; import java.util.concurrent.TimeUnit; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.temporal.TemporalUtil; import stormpot.Allocator; import stormpot.BlazePool; import stormpot.Completion; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/ResultReporter.java b/src/main/java/org/graphybench/driver/driver/ResultReporter.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/ResultReporter.java rename to src/main/java/org/graphybench/driver/driver/ResultReporter.java index 10513de9a52e616cef7ac4343dae7d229b98275c..3221ff6fed1072127de75b8e39f54d71fbccb6e9 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/ResultReporter.java +++ b/src/main/java/org/graphybench/driver/driver/ResultReporter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; import static java.lang.String.format; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; public interface ResultReporter { void report( diff --git a/src/main/java/org/ldbcouncil/finbench/driver/SerializingMarshallingException.java b/src/main/java/org/graphybench/driver/driver/SerializingMarshallingException.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/SerializingMarshallingException.java rename to src/main/java/org/graphybench/driver/driver/SerializingMarshallingException.java index 362dcabdf458dec7dc76ea66618070afc453ee23..d0a68f17bd4db0d2d791c4124cc8ef75aa020fa7 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/SerializingMarshallingException.java +++ b/src/main/java/org/graphybench/driver/driver/SerializingMarshallingException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; public class SerializingMarshallingException extends Exception { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/Workload.java b/src/main/java/org/graphybench/driver/driver/Workload.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/Workload.java rename to src/main/java/org/graphybench/driver/driver/Workload.java index db64b0b6184e8d2179dd79b784120acde2506498..bc95c1a5ba45b00dad7dbbe2255239c7c6032713 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/Workload.java +++ b/src/main/java/org/graphybench/driver/driver/Workload.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; import java.io.Closeable; import java.io.IOException; @@ -23,9 +23,9 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.ldbcouncil.finbench.driver.control.DriverConfiguration; -import org.ldbcouncil.finbench.driver.generator.GeneratorFactory; -import org.ldbcouncil.finbench.driver.validation.ResultsLogValidationTolerances; +import org.graphybench.driver.driver.control.DriverConfiguration; +import org.graphybench.driver.driver.generator.GeneratorFactory; +import org.graphybench.driver.driver.validation.ResultsLogValidationTolerances; public abstract class Workload implements Closeable { public static final long DEFAULT_MAXIMUM_EXPECTED_INTERLEAVE_AS_MILLI = TimeUnit.HOURS.toMillis(1); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/WorkloadException.java b/src/main/java/org/graphybench/driver/driver/WorkloadException.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/WorkloadException.java rename to src/main/java/org/graphybench/driver/driver/WorkloadException.java index fa3f5b8af544f8d941baf3f270380225bd381f6b..365377840b4ee5e9457795e70a00d9a647bb89c9 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/WorkloadException.java +++ b/src/main/java/org/graphybench/driver/driver/WorkloadException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; public class WorkloadException extends Exception { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/WorkloadStreams.java b/src/main/java/org/graphybench/driver/driver/WorkloadStreams.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/WorkloadStreams.java rename to src/main/java/org/graphybench/driver/driver/WorkloadStreams.java index 692d79ee82300fae67c8ffd59e6e9e3ff6cdfbed..68f67a49f91c47757fc70135b15eecfc0d37406e 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/WorkloadStreams.java +++ b/src/main/java/org/graphybench/driver/driver/WorkloadStreams.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver; +package org.graphybench.driver.driver; import static java.lang.String.format; @@ -29,14 +29,14 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; import java.util.Set; -import org.ldbcouncil.finbench.driver.control.DriverConfiguration; -import org.ldbcouncil.finbench.driver.generator.GeneratorFactory; -import org.ldbcouncil.finbench.driver.log.LoggingService; -import org.ldbcouncil.finbench.driver.log.LoggingServiceFactory; -import org.ldbcouncil.finbench.driver.util.Tuple; -import org.ldbcouncil.finbench.driver.util.Tuple3; -import org.ldbcouncil.finbench.driver.workloads.ClassNameWorkloadFactory; -import org.ldbcouncil.finbench.driver.workloads.WorkloadFactory; +import org.graphybench.driver.driver.control.DriverConfiguration; +import org.graphybench.driver.driver.generator.GeneratorFactory; +import org.graphybench.driver.driver.log.LoggingService; +import org.graphybench.driver.driver.log.LoggingServiceFactory; +import org.graphybench.driver.driver.util.Tuple; +import org.graphybench.driver.driver.util.Tuple3; +import org.graphybench.driver.driver.workloads.ClassNameWorkloadFactory; +import org.graphybench.driver.driver.workloads.WorkloadFactory; public class WorkloadStreams { private final List blockingStreams = new ArrayList<>(); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/constant/OutputFormat.java b/src/main/java/org/graphybench/driver/driver/constant/OutputFormat.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/constant/OutputFormat.java rename to src/main/java/org/graphybench/driver/driver/constant/OutputFormat.java index 9b6ca6cacc337ddd7adbe97be7c2aec72dbbe6e6..7792a0d192f7930c81f885d7735bf80ae2814627 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/constant/OutputFormat.java +++ b/src/main/java/org/graphybench/driver/driver/constant/OutputFormat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.constant; +package org.graphybench.driver.driver.constant; import java.text.DecimalFormat; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/control/ConsoleAndFileDriverConfiguration.java b/src/main/java/org/graphybench/driver/driver/control/ConsoleAndFileDriverConfiguration.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/control/ConsoleAndFileDriverConfiguration.java rename to src/main/java/org/graphybench/driver/driver/control/ConsoleAndFileDriverConfiguration.java index ed14d4bf74a2997f51dd9de7e0c1094568b8fafb..c15f1157eb2e45e41f55422c9c71101a9957b902 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/control/ConsoleAndFileDriverConfiguration.java +++ b/src/main/java/org/graphybench/driver/driver/control/ConsoleAndFileDriverConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.control; +package org.graphybench.driver.driver.control; import static java.lang.String.format; @@ -45,13 +45,13 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.ldbcouncil.finbench.driver.driver.Driver; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; -import org.ldbcouncil.finbench.driver.util.MapUtils; -import org.ldbcouncil.finbench.driver.workloads.simple.SimpleWorkload; -import org.ldbcouncil.finbench.driver.workloads.simple.db.SimpleDb; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcFinBenchTransactionWorkload; -import org.ldbcouncil.finbench.driver.workloads.transaction.db.DummyLdbcFinBenchTransactionDb; +import org.graphybench.driver.driver.driver.Driver; +import org.graphybench.driver.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.util.MapUtils; +import org.graphybench.driver.driver.workloads.simple.SimpleWorkload; +import org.graphybench.driver.driver.workloads.simple.db.SimpleDb; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchTransactionWorkload; +import org.graphybench.driver.driver.workloads.transaction.db.DummyGraphyBenchTransactionDb; public class ConsoleAndFileDriverConfiguration implements DriverConfiguration { // --- MODE --- @@ -84,7 +84,7 @@ public class ConsoleAndFileDriverConfiguration implements DriverConfiguration { public static final boolean FLUSH_LOG_DEFAULT = false; public static final String FLUSH_LOG_DEFAULT_STRING = Boolean.toString(FLUSH_LOG_DEFAULT); public static final String NAME_ARG = "nm"; - public static final String NAME_DEFAULT = "LDBC"; + public static final String NAME_DEFAULT = ""; public static final String NAME_DEFAULT_STRING = NAME_DEFAULT; public static final String RESULT_DIR_PATH_ARG = "rd"; public static final String RESULT_DIR_PATH_DEFAULT = "results"; @@ -980,7 +980,7 @@ public class ConsoleAndFileDriverConfiguration implements DriverConfiguration { StringBuilder sb = new StringBuilder(); sb.append("# -------------------------------------\n"); sb.append("# -------------------------------------\n"); - sb.append("# ----- LDBC Driver Configuration -----\n"); + sb.append("# ----- Driver Configuration -----\n"); sb.append("# -------------------------------------\n"); sb.append("# -------------------------------------\n"); sb.append("\n"); @@ -1088,7 +1088,7 @@ public class ConsoleAndFileDriverConfiguration implements DriverConfiguration { sb.append("# ***************************************************************\n"); sb.append("\n"); sb.append("# fully qualified class name of the Workload (class) implementation to execute\n"); - sb.append("# STRING (e.g., ").append(LdbcFinBenchTransactionWorkload.class.getName()).append(")\n"); + sb.append("# STRING (e.g., ").append(GraphyBenchTransactionWorkload.class.getName()).append(")\n"); sb.append("# COMMAND: ").append("-").append(WORKLOAD_ARG).append("/--").append(WORKLOAD_ARG_LONG).append("\n"); if (null == workloadClassName) { sb.append("# ").append(WORKLOAD_ARG_LONG).append("=").append("\n"); @@ -1111,7 +1111,7 @@ public class ConsoleAndFileDriverConfiguration implements DriverConfiguration { sb.append("# ************************************************************************************\n"); sb.append("\n"); sb.append("# fully qualified class name of the Db (class) implementation to execute\n"); - sb.append("# STRING (e.g., ").append(DummyLdbcFinBenchTransactionDb.class.getName()).append(")\n"); + sb.append("# STRING (e.g., ").append(DummyGraphyBenchTransactionDb.class.getName()).append(")\n"); sb.append("# COMMAND: ").append("-").append(DB_ARG).append("/--").append(DB_ARG_LONG).append("\n"); if (null == dbClassName) { sb.append("# ").append(DB_ARG_LONG).append("=").append("\n"); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/control/ControlService.java b/src/main/java/org/graphybench/driver/driver/control/ControlService.java similarity index 84% rename from src/main/java/org/ldbcouncil/finbench/driver/control/ControlService.java rename to src/main/java/org/graphybench/driver/driver/control/ControlService.java index 7b816b1dbcbf93af4a0d75353e8baad70fc5badf..ff1eaa95ecc1a94e5e28de8802ebcef4f9e03974 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/control/ControlService.java +++ b/src/main/java/org/graphybench/driver/driver/control/ControlService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.control; +package org.graphybench.driver.driver.control; -import org.ldbcouncil.finbench.driver.log.LoggingServiceFactory; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; +import org.graphybench.driver.driver.log.LoggingServiceFactory; +import org.graphybench.driver.driver.temporal.TimeSource; public interface ControlService { DriverConfiguration configuration(); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/control/DriverConfiguration.java b/src/main/java/org/graphybench/driver/driver/control/DriverConfiguration.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/control/DriverConfiguration.java rename to src/main/java/org/graphybench/driver/driver/control/DriverConfiguration.java index 192829ff5b4c90f2d163ae201d524d57ade8c04e..a0198cf369c59e328d989ad1317d5566f26efaf0 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/control/DriverConfiguration.java +++ b/src/main/java/org/graphybench/driver/driver/control/DriverConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.control; +package org.graphybench.driver.driver.control; import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/control/DriverConfigurationException.java b/src/main/java/org/graphybench/driver/driver/control/DriverConfigurationException.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/control/DriverConfigurationException.java rename to src/main/java/org/graphybench/driver/driver/control/DriverConfigurationException.java index 3d3f846a3d34a43f7b293ad6fd64b1559416ada2..877f43ecae81136ee9aab1c47d36225ff368ca6d 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/control/DriverConfigurationException.java +++ b/src/main/java/org/graphybench/driver/driver/control/DriverConfigurationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.control; +package org.graphybench.driver.driver.control; public class DriverConfigurationException extends Exception { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/control/LocalControlService.java b/src/main/java/org/graphybench/driver/driver/control/LocalControlService.java similarity index 90% rename from src/main/java/org/ldbcouncil/finbench/driver/control/LocalControlService.java rename to src/main/java/org/graphybench/driver/driver/control/LocalControlService.java index 6172dfee4a284ca31ae5b8660eaed9739c88e820..cd6c0d2128d313e33e5ba243c476e6dcf53d65f9 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/control/LocalControlService.java +++ b/src/main/java/org/graphybench/driver/driver/control/LocalControlService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.control; +package org.graphybench.driver.driver.control; -import org.ldbcouncil.finbench.driver.log.LoggingServiceFactory; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; +import org.graphybench.driver.driver.log.LoggingServiceFactory; +import org.graphybench.driver.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.temporal.TimeSource; public class LocalControlService implements ControlService { private final TemporalUtil temporalUtil = new TemporalUtil(); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/control/OperationMode.java b/src/main/java/org/graphybench/driver/driver/control/OperationMode.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/control/OperationMode.java rename to src/main/java/org/graphybench/driver/driver/control/OperationMode.java index da4c8f31730b07cddf2e90b60ee21b6165338664..8436d127ed7c54415d5098c4dbd38b3fbf589727 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/control/OperationMode.java +++ b/src/main/java/org/graphybench/driver/driver/control/OperationMode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.control; +package org.graphybench.driver.driver.control; public enum OperationMode { CREATE_VALIDATION, diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/DuckDbExtractor.java b/src/main/java/org/graphybench/driver/driver/csv/DuckDbExtractor.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/DuckDbExtractor.java rename to src/main/java/org/graphybench/driver/driver/csv/DuckDbExtractor.java index 34cd4c3a6d2f5c72bc76d31299477c64f22ed6ef..d38eb027e49acbb383fca61d493349dc4d837b8c 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/DuckDbExtractor.java +++ b/src/main/java/org/graphybench/driver/driver/csv/DuckDbExtractor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv; +package org.graphybench.driver.driver.csv; import java.io.Closeable; import java.sql.Connection; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/FileLoader.java b/src/main/java/org/graphybench/driver/driver/csv/FileLoader.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/FileLoader.java rename to src/main/java/org/graphybench/driver/driver/csv/FileLoader.java index 7fc3e12712c572f871d0521b86aae041c33d7ba0..d7cc6af1af07daf7e86243e7ce66e40791b596ea 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/FileLoader.java +++ b/src/main/java/org/graphybench/driver/driver/csv/FileLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv; +package org.graphybench.driver.driver.csv; import static java.lang.String.format; @@ -25,10 +25,10 @@ import java.sql.Statement; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.generator.EventStreamReader; -import org.ldbcouncil.finbench.driver.util.Tuple2; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.generator.EventStreamReader; +import org.graphybench.driver.driver.util.Tuple2; /** * Class to read Parquet/CSV files for operation streams. diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/BufferedCharSeeker.java b/src/main/java/org/graphybench/driver/driver/csv/charseeker/BufferedCharSeeker.java similarity index 99% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/BufferedCharSeeker.java rename to src/main/java/org/graphybench/driver/driver/csv/charseeker/BufferedCharSeeker.java index 514dc9bbe5584e001f2c934803cbc30312d1f33b..c9572055e8f8ab9d029538e30c3975e9ed969d84 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/BufferedCharSeeker.java +++ b/src/main/java/org/graphybench/driver/driver/csv/charseeker/BufferedCharSeeker.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv.charseeker; +package org.graphybench.driver.driver.csv.charseeker; import static java.lang.Math.max; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/CharReadable.java b/src/main/java/org/graphybench/driver/driver/csv/charseeker/CharReadable.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/CharReadable.java rename to src/main/java/org/graphybench/driver/driver/csv/charseeker/CharReadable.java index 1234c0914b121430e8d630a6bd11d863444c5aa8..43315383fb69a56078bd624e3ee9dfa5741588e0 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/CharReadable.java +++ b/src/main/java/org/graphybench/driver/driver/csv/charseeker/CharReadable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv.charseeker; +package org.graphybench.driver.driver.csv.charseeker; import java.io.Closeable; import java.io.IOException; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/CharSeeker.java b/src/main/java/org/graphybench/driver/driver/csv/charseeker/CharSeeker.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/CharSeeker.java rename to src/main/java/org/graphybench/driver/driver/csv/charseeker/CharSeeker.java index 62a45f726d215c910188cd3b1af659099cd2080c..da1496b93de246cca1c86677f35a6f085e3bf6e7 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/CharSeeker.java +++ b/src/main/java/org/graphybench/driver/driver/csv/charseeker/CharSeeker.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv.charseeker; +package org.graphybench.driver.driver.csv.charseeker; import java.io.Closeable; import java.io.IOException; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/CharSeekerParams.java b/src/main/java/org/graphybench/driver/driver/csv/charseeker/CharSeekerParams.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/CharSeekerParams.java rename to src/main/java/org/graphybench/driver/driver/csv/charseeker/CharSeekerParams.java index c53ecfd800a80956e644f7ea9bae29bfb08d5920..5c3d07f913b31c7c62e50ad8d345abd3dbc18e12 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/CharSeekerParams.java +++ b/src/main/java/org/graphybench/driver/driver/csv/charseeker/CharSeekerParams.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv.charseeker; +package org.graphybench.driver.driver.csv.charseeker; public class CharSeekerParams { private final int bufferSize; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/CharSeekers.java b/src/main/java/org/graphybench/driver/driver/csv/charseeker/CharSeekers.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/CharSeekers.java rename to src/main/java/org/graphybench/driver/driver/csv/charseeker/CharSeekers.java index 8bbcee7d2bcb98d23746944f989860b208bd8398..c6df784c8af97cf8524d7bdb8f95083fddb9fd35 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/CharSeekers.java +++ b/src/main/java/org/graphybench/driver/driver/csv/charseeker/CharSeekers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv.charseeker; +package org.graphybench.driver.driver.csv.charseeker; import java.io.FileNotFoundException; import java.io.FileReader; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/Extractor.java b/src/main/java/org/graphybench/driver/driver/csv/charseeker/Extractor.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/Extractor.java rename to src/main/java/org/graphybench/driver/driver/csv/charseeker/Extractor.java index 6e915aaef4f4e001436c43592041d4d145138924..ac0a72c0694fecfa6ddc1df93bf35b6a1feb570f 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/Extractor.java +++ b/src/main/java/org/graphybench/driver/driver/csv/charseeker/Extractor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv.charseeker; +package org.graphybench.driver.driver.csv.charseeker; /** * Extracts a value from a part of a {@code char[]} into any type of value, f.ex. a {@link Extractors#string()} diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/Extractors.java b/src/main/java/org/graphybench/driver/driver/csv/charseeker/Extractors.java similarity index 99% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/Extractors.java rename to src/main/java/org/graphybench/driver/driver/csv/charseeker/Extractors.java index 6f56ad7a1acbfde398eac2ccdf62007235d054ce..0849f5ca0df07ae9aaf253398e792a85a40665ca 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/Extractors.java +++ b/src/main/java/org/graphybench/driver/driver/csv/charseeker/Extractors.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv.charseeker; +package org.graphybench.driver.driver.csv.charseeker; import static java.lang.reflect.Modifier.isStatic; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/Mark.java b/src/main/java/org/graphybench/driver/driver/csv/charseeker/Mark.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/Mark.java rename to src/main/java/org/graphybench/driver/driver/csv/charseeker/Mark.java index 10692ca5688836670a9908ff4ce4025237aff785..310a7875d56b0083d852d26a2f743d3a21999ffa 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/Mark.java +++ b/src/main/java/org/graphybench/driver/driver/csv/charseeker/Mark.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv.charseeker; +package org.graphybench.driver.driver.csv.charseeker; import static java.lang.String.format; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/MultiReadable.java b/src/main/java/org/graphybench/driver/driver/csv/charseeker/MultiReadable.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/MultiReadable.java rename to src/main/java/org/graphybench/driver/driver/csv/charseeker/MultiReadable.java index 13725d45a931fa45b7bfa6343dc286c8a795b103..5d749ca2290f70fd79447496369c75865e021cd7 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/MultiReadable.java +++ b/src/main/java/org/graphybench/driver/driver/csv/charseeker/MultiReadable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv.charseeker; +package org.graphybench.driver.driver.csv.charseeker; import java.io.Closeable; import java.io.IOException; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/RawFunction.java b/src/main/java/org/graphybench/driver/driver/csv/charseeker/RawFunction.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/RawFunction.java rename to src/main/java/org/graphybench/driver/driver/csv/charseeker/RawFunction.java index 46daa734aa72ff6a6f428d0226d9b39783fdc1d2..6b4b08c0245cc84f8a86432b46dbcd22e6e67d8f 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/RawFunction.java +++ b/src/main/java/org/graphybench/driver/driver/csv/charseeker/RawFunction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv.charseeker; +package org.graphybench.driver.driver.csv.charseeker; /** * Generic function interface to map from one type to another. diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/RawIterator.java b/src/main/java/org/graphybench/driver/driver/csv/charseeker/RawIterator.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/RawIterator.java rename to src/main/java/org/graphybench/driver/driver/csv/charseeker/RawIterator.java index 1ab3105295205e9a22626f46f9232e9bfd54ebcc..f7dd23d80680eff5ba3e2782852f73406ecaa73b 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/RawIterator.java +++ b/src/main/java/org/graphybench/driver/driver/csv/charseeker/RawIterator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv.charseeker; +package org.graphybench.driver.driver.csv.charseeker; import java.util.Iterator; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/Readables.java b/src/main/java/org/graphybench/driver/driver/csv/charseeker/Readables.java similarity index 99% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/Readables.java rename to src/main/java/org/graphybench/driver/driver/csv/charseeker/Readables.java index 9a387f909de1aaeabe490171c07e99a583cd5937..d21d9364285e8c0723d8541e55322b8ab8146447 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/Readables.java +++ b/src/main/java/org/graphybench/driver/driver/csv/charseeker/Readables.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv.charseeker; +package org.graphybench.driver.driver.csv.charseeker; import java.io.DataInputStream; import java.io.EOFException; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/ThreadAheadReadable.java b/src/main/java/org/graphybench/driver/driver/csv/charseeker/ThreadAheadReadable.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/ThreadAheadReadable.java rename to src/main/java/org/graphybench/driver/driver/csv/charseeker/ThreadAheadReadable.java index 484b27246b83d56b4d3927363956cc3bc49efdce..211e873edaeb051272b5b65697b07273792f988f 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/charseeker/ThreadAheadReadable.java +++ b/src/main/java/org/graphybench/driver/driver/csv/charseeker/ThreadAheadReadable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv.charseeker; +package org.graphybench.driver.driver.csv.charseeker; import static java.lang.Math.min; import static java.lang.System.arraycopy; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/simple/SimpleCsvFileReader.java b/src/main/java/org/graphybench/driver/driver/csv/simple/SimpleCsvFileReader.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/simple/SimpleCsvFileReader.java rename to src/main/java/org/graphybench/driver/driver/csv/simple/SimpleCsvFileReader.java index 31f1bb14944416406de2e65415805f5ff4c6a50f..e98a7f239179f1d2c1ee1ee340b58f551525a701 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/simple/SimpleCsvFileReader.java +++ b/src/main/java/org/graphybench/driver/driver/csv/simple/SimpleCsvFileReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv.simple; +package org.graphybench.driver.driver.csv.simple; import static java.lang.String.format; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/csv/simple/SimpleCsvFileWriter.java b/src/main/java/org/graphybench/driver/driver/csv/simple/SimpleCsvFileWriter.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/csv/simple/SimpleCsvFileWriter.java rename to src/main/java/org/graphybench/driver/driver/csv/simple/SimpleCsvFileWriter.java index b95537894d6b65903660555cda503e4bdb4be0c3..7320407cbd1dd82094d9bc17a1ada35d16fc373a 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/csv/simple/SimpleCsvFileWriter.java +++ b/src/main/java/org/graphybench/driver/driver/csv/simple/SimpleCsvFileWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.csv.simple; +package org.graphybench.driver.driver.csv.simple; import com.google.common.base.Charsets; import java.io.BufferedWriter; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/driver/CalculateWorkloadStatisticsMode.java b/src/main/java/org/graphybench/driver/driver/driver/CalculateWorkloadStatisticsMode.java similarity index 84% rename from src/main/java/org/ldbcouncil/finbench/driver/driver/CalculateWorkloadStatisticsMode.java rename to src/main/java/org/graphybench/driver/driver/driver/CalculateWorkloadStatisticsMode.java index f0c1a4f2874c5d54281b3dc24cb1546d87014fa5..93994d6e6cf77b0c60596be2ec039a86aeab5ddd 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/driver/CalculateWorkloadStatisticsMode.java +++ b/src/main/java/org/graphybench/driver/driver/driver/CalculateWorkloadStatisticsMode.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.driver; +package org.graphybench.driver.driver.driver; import static java.lang.String.format; import java.util.concurrent.TimeUnit; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.WorkloadStreams; -import org.ldbcouncil.finbench.driver.control.ControlService; -import org.ldbcouncil.finbench.driver.generator.GeneratorFactory; -import org.ldbcouncil.finbench.driver.generator.RandomDataGeneratorFactory; -import org.ldbcouncil.finbench.driver.log.LoggingService; -import org.ldbcouncil.finbench.driver.runtime.metrics.MetricsCollectionException; -import org.ldbcouncil.finbench.driver.statistics.WorkloadStatistics; -import org.ldbcouncil.finbench.driver.statistics.WorkloadStatisticsCalculator; -import org.ldbcouncil.finbench.driver.util.Tuple3; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.WorkloadStreams; +import org.graphybench.driver.driver.control.ControlService; +import org.graphybench.driver.driver.generator.GeneratorFactory; +import org.graphybench.driver.driver.generator.RandomDataGeneratorFactory; +import org.graphybench.driver.driver.log.LoggingService; +import org.graphybench.driver.driver.runtime.metrics.MetricsCollectionException; +import org.graphybench.driver.driver.statistics.WorkloadStatistics; +import org.graphybench.driver.driver.statistics.WorkloadStatisticsCalculator; +import org.graphybench.driver.driver.util.Tuple3; public class CalculateWorkloadStatisticsMode implements DriverMode { private final ControlService controlService; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/driver/CreateValidationParamsMode.java b/src/main/java/org/graphybench/driver/driver/driver/CreateValidationParamsMode.java similarity index 87% rename from src/main/java/org/ldbcouncil/finbench/driver/driver/CreateValidationParamsMode.java rename to src/main/java/org/graphybench/driver/driver/driver/CreateValidationParamsMode.java index 2d8ab536f58046783e344eae7451e436e04727a2..3803957ac1f935bc68540ee2114bb74535d3f979 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/driver/CreateValidationParamsMode.java +++ b/src/main/java/org/graphybench/driver/driver/driver/CreateValidationParamsMode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.driver; +package org.graphybench.driver.driver.driver; import static java.lang.String.format; @@ -22,19 +22,19 @@ import com.google.common.collect.ImmutableList; import java.io.File; import java.util.Iterator; import java.util.List; -import org.ldbcouncil.finbench.driver.Db; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.WorkloadStreams; -import org.ldbcouncil.finbench.driver.control.ControlService; -import org.ldbcouncil.finbench.driver.generator.GeneratorFactory; -import org.ldbcouncil.finbench.driver.generator.RandomDataGeneratorFactory; -import org.ldbcouncil.finbench.driver.log.LoggingService; -import org.ldbcouncil.finbench.driver.util.ClassLoaderHelper; -import org.ldbcouncil.finbench.driver.util.Tuple3; -import org.ldbcouncil.finbench.driver.validation.ValidationParam; -import org.ldbcouncil.finbench.driver.validation.ValidationParamsGenerator; -import org.ldbcouncil.finbench.driver.validation.ValidationParamsToJson; +import org.graphybench.driver.driver.Db; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.WorkloadStreams; +import org.graphybench.driver.driver.control.ControlService; +import org.graphybench.driver.driver.generator.GeneratorFactory; +import org.graphybench.driver.driver.generator.RandomDataGeneratorFactory; +import org.graphybench.driver.driver.log.LoggingService; +import org.graphybench.driver.driver.util.ClassLoaderHelper; +import org.graphybench.driver.driver.util.Tuple3; +import org.graphybench.driver.driver.validation.ValidationParam; +import org.graphybench.driver.driver.validation.ValidationParamsGenerator; +import org.graphybench.driver.driver.validation.ValidationParamsToJson; public class CreateValidationParamsMode implements DriverMode { private final ControlService controlService; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/driver/Driver.java b/src/main/java/org/graphybench/driver/driver/driver/Driver.java similarity index 83% rename from src/main/java/org/ldbcouncil/finbench/driver/driver/Driver.java rename to src/main/java/org/graphybench/driver/driver/driver/Driver.java index 7b4a246fab87ae3c2bdbc58dddd0f4cf9768449b..4f66705c9d092c078ef00243cd3f763eab6b65f2 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/driver/Driver.java +++ b/src/main/java/org/graphybench/driver/driver/driver/Driver.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.driver; +package org.graphybench.driver.driver.driver; import static java.lang.String.format; import java.util.List; import java.util.concurrent.TimeUnit; -import org.ldbcouncil.finbench.driver.control.ConsoleAndFileDriverConfiguration; -import org.ldbcouncil.finbench.driver.control.ControlService; -import org.ldbcouncil.finbench.driver.control.DriverConfigurationException; -import org.ldbcouncil.finbench.driver.control.LocalControlService; -import org.ldbcouncil.finbench.driver.control.OperationMode; -import org.ldbcouncil.finbench.driver.log.Log4jLoggingServiceFactory; -import org.ldbcouncil.finbench.driver.log.LoggingService; -import org.ldbcouncil.finbench.driver.log.LoggingServiceFactory; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; -import org.ldbcouncil.finbench.driver.temporal.SystemTimeSource; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; +import org.graphybench.driver.driver.control.ConsoleAndFileDriverConfiguration; +import org.graphybench.driver.driver.control.ControlService; +import org.graphybench.driver.driver.control.DriverConfigurationException; +import org.graphybench.driver.driver.control.LocalControlService; +import org.graphybench.driver.driver.control.OperationMode; +import org.graphybench.driver.driver.log.Log4jLoggingServiceFactory; +import org.graphybench.driver.driver.log.LoggingService; +import org.graphybench.driver.driver.log.LoggingServiceFactory; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.temporal.SystemTimeSource; +import org.graphybench.driver.driver.temporal.TimeSource; public class Driver { private static final long RANDOM_SEED = 42; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/driver/DriverException.java b/src/main/java/org/graphybench/driver/driver/driver/DriverException.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/driver/DriverException.java rename to src/main/java/org/graphybench/driver/driver/driver/DriverException.java index 4d1e29bdc3b3156a013ef49c9bf487413cd57223..cd4281cef4265a3d2d6a0d9f10c0adcced97a9a0 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/driver/DriverException.java +++ b/src/main/java/org/graphybench/driver/driver/driver/DriverException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.driver; +package org.graphybench.driver.driver.driver; public class DriverException extends Exception { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/driver/DriverMode.java b/src/main/java/org/graphybench/driver/driver/driver/DriverMode.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/driver/DriverMode.java rename to src/main/java/org/graphybench/driver/driver/driver/DriverMode.java index 85ac3ce21bad0e11140ebd2076ce7408ba586875..c23b76444e519921dbd009fb303473af552740d9 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/driver/DriverMode.java +++ b/src/main/java/org/graphybench/driver/driver/driver/DriverMode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.driver; +package org.graphybench.driver.driver.driver; public interface DriverMode { void init() throws DriverException; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/driver/ExecuteWorkloadMode.java b/src/main/java/org/graphybench/driver/driver/driver/ExecuteWorkloadMode.java similarity index 88% rename from src/main/java/org/ldbcouncil/finbench/driver/driver/ExecuteWorkloadMode.java rename to src/main/java/org/graphybench/driver/driver/driver/ExecuteWorkloadMode.java index ee5e6e1533aad24022f5a0ef43edb4f4728a8d87..7b2dbdf1010f58adede4f47f1e5bebd4fa7813ad 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/driver/ExecuteWorkloadMode.java +++ b/src/main/java/org/graphybench/driver/driver/driver/ExecuteWorkloadMode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.driver; +package org.graphybench.driver.driver.driver; import static java.lang.String.format; @@ -27,40 +27,40 @@ import java.nio.file.Files; import java.time.Duration; import java.time.Instant; import java.util.concurrent.TimeUnit; -import org.ldbcouncil.finbench.driver.Db; -import org.ldbcouncil.finbench.driver.DbException; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.WorkloadStreams; -import org.ldbcouncil.finbench.driver.control.ControlService; -import org.ldbcouncil.finbench.driver.generator.GeneratorFactory; -import org.ldbcouncil.finbench.driver.generator.RandomDataGeneratorFactory; -import org.ldbcouncil.finbench.driver.log.LoggingService; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; -import org.ldbcouncil.finbench.driver.runtime.DefaultQueues; -import org.ldbcouncil.finbench.driver.runtime.SimpleResultsLogWriter; -import org.ldbcouncil.finbench.driver.runtime.WorkloadRunner; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeException; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeService; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeServiceAssistant; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeWriter; -import org.ldbcouncil.finbench.driver.runtime.metrics.DisruptorSbeMetricsService; -import org.ldbcouncil.finbench.driver.runtime.metrics.JsonWorkloadMetricsFormatter; -import org.ldbcouncil.finbench.driver.runtime.metrics.MetricsCollectionException; -import org.ldbcouncil.finbench.driver.runtime.metrics.MetricsManager; -import org.ldbcouncil.finbench.driver.runtime.metrics.MetricsService; -import org.ldbcouncil.finbench.driver.runtime.metrics.NullResultsLogWriter; -import org.ldbcouncil.finbench.driver.runtime.metrics.ResultsLogWriter; -import org.ldbcouncil.finbench.driver.runtime.metrics.WorkloadResultsSnapshot; -import org.ldbcouncil.finbench.driver.runtime.metrics.WorkloadStatusSnapshot; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; -import org.ldbcouncil.finbench.driver.util.ClassLoaderHelper; -import org.ldbcouncil.finbench.driver.util.Tuple3; -import org.ldbcouncil.finbench.driver.validation.ResultsLogValidationResult; -import org.ldbcouncil.finbench.driver.validation.ResultsLogValidationSummary; -import org.ldbcouncil.finbench.driver.validation.ResultsLogValidationTolerances; -import org.ldbcouncil.finbench.driver.validation.ResultsLogValidator; +import org.graphybench.driver.driver.Db; +import org.graphybench.driver.driver.DbException; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.WorkloadStreams; +import org.graphybench.driver.driver.control.ControlService; +import org.graphybench.driver.driver.generator.GeneratorFactory; +import org.graphybench.driver.driver.generator.RandomDataGeneratorFactory; +import org.graphybench.driver.driver.log.LoggingService; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.DefaultQueues; +import org.graphybench.driver.driver.runtime.SimpleResultsLogWriter; +import org.graphybench.driver.driver.runtime.WorkloadRunner; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeException; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeService; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeServiceAssistant; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeWriter; +import org.graphybench.driver.driver.runtime.metrics.DisruptorSbeMetricsService; +import org.graphybench.driver.driver.runtime.metrics.JsonWorkloadMetricsFormatter; +import org.graphybench.driver.driver.runtime.metrics.MetricsCollectionException; +import org.graphybench.driver.driver.runtime.metrics.MetricsManager; +import org.graphybench.driver.driver.runtime.metrics.MetricsService; +import org.graphybench.driver.driver.runtime.metrics.NullResultsLogWriter; +import org.graphybench.driver.driver.runtime.metrics.ResultsLogWriter; +import org.graphybench.driver.driver.runtime.metrics.WorkloadResultsSnapshot; +import org.graphybench.driver.driver.runtime.metrics.WorkloadStatusSnapshot; +import org.graphybench.driver.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.temporal.TimeSource; +import org.graphybench.driver.driver.util.ClassLoaderHelper; +import org.graphybench.driver.driver.util.Tuple3; +import org.graphybench.driver.driver.validation.ResultsLogValidationResult; +import org.graphybench.driver.driver.validation.ResultsLogValidationSummary; +import org.graphybench.driver.driver.validation.ResultsLogValidationTolerances; +import org.graphybench.driver.driver.validation.ResultsLogValidator; public class ExecuteWorkloadMode implements DriverMode { private final ControlService controlService; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/driver/PrintHelpMode.java b/src/main/java/org/graphybench/driver/driver/driver/PrintHelpMode.java similarity index 88% rename from src/main/java/org/ldbcouncil/finbench/driver/driver/PrintHelpMode.java rename to src/main/java/org/graphybench/driver/driver/driver/PrintHelpMode.java index a9a3b48528287936473f6c54aa17624afb4127af..1382b7f98dc10b80189c17f90a32c0765a68c1fe 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/driver/PrintHelpMode.java +++ b/src/main/java/org/graphybench/driver/driver/driver/PrintHelpMode.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.driver; +package org.graphybench.driver.driver.driver; -import org.ldbcouncil.finbench.driver.control.ControlService; -import org.ldbcouncil.finbench.driver.log.LoggingService; +import org.graphybench.driver.driver.control.ControlService; +import org.graphybench.driver.driver.log.LoggingService; public class PrintHelpMode implements DriverMode { private final ControlService controlService; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/driver/ResultsDirectory.java b/src/main/java/org/graphybench/driver/driver/driver/ResultsDirectory.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/driver/ResultsDirectory.java rename to src/main/java/org/graphybench/driver/driver/driver/ResultsDirectory.java index 2848802b309ab32463d01da623c4a9be15bf04a6..50f59dd298ed959e8896fdb3173eb1e23f6526e6 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/driver/ResultsDirectory.java +++ b/src/main/java/org/graphybench/driver/driver/driver/ResultsDirectory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.driver; +package org.graphybench.driver.driver.driver; import static java.util.stream.Collectors.joining; @@ -29,12 +29,12 @@ import java.util.Collections; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.ldbcouncil.finbench.driver.control.ConsoleAndFileDriverConfiguration; -import org.ldbcouncil.finbench.driver.control.DriverConfiguration; -import org.ldbcouncil.finbench.driver.control.DriverConfigurationException; -import org.ldbcouncil.finbench.driver.csv.simple.SimpleCsvFileReader; -import org.ldbcouncil.finbench.driver.util.FileUtils; -import org.ldbcouncil.finbench.driver.util.MapUtils; +import org.graphybench.driver.driver.control.ConsoleAndFileDriverConfiguration; +import org.graphybench.driver.driver.control.DriverConfiguration; +import org.graphybench.driver.driver.control.DriverConfigurationException; +import org.graphybench.driver.driver.csv.simple.SimpleCsvFileReader; +import org.graphybench.driver.driver.util.FileUtils; +import org.graphybench.driver.driver.util.MapUtils; public class ResultsDirectory { public enum BenchmarkPhase { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/driver/ValidateDatabaseMode.java b/src/main/java/org/graphybench/driver/driver/driver/ValidateDatabaseMode.java similarity index 90% rename from src/main/java/org/ldbcouncil/finbench/driver/driver/ValidateDatabaseMode.java rename to src/main/java/org/graphybench/driver/driver/driver/ValidateDatabaseMode.java index 328bde35932bc14701bcb78fdc56e16cc54c3ace..44e5bbdb3b737be56d6440a6bca62e3f9633e16a 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/driver/ValidateDatabaseMode.java +++ b/src/main/java/org/graphybench/driver/driver/driver/ValidateDatabaseMode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.driver; +package org.graphybench.driver.driver.driver; import static java.lang.String.format; @@ -26,17 +26,17 @@ import java.io.Writer; import java.util.List; import org.apache.commons.io.Charsets; import org.apache.commons.io.FileUtils; -import org.ldbcouncil.finbench.driver.Db; -import org.ldbcouncil.finbench.driver.DbException; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.control.ControlService; -import org.ldbcouncil.finbench.driver.log.LoggingService; -import org.ldbcouncil.finbench.driver.util.ClassLoaderHelper; -import org.ldbcouncil.finbench.driver.validation.DbValidationResult; -import org.ldbcouncil.finbench.driver.validation.DbValidator; -import org.ldbcouncil.finbench.driver.validation.ValidationParam; -import org.ldbcouncil.finbench.driver.validation.ValidationParamsFromJson; +import org.graphybench.driver.driver.Db; +import org.graphybench.driver.driver.DbException; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.control.ControlService; +import org.graphybench.driver.driver.log.LoggingService; +import org.graphybench.driver.driver.util.ClassLoaderHelper; +import org.graphybench.driver.driver.validation.DbValidationResult; +import org.graphybench.driver.driver.validation.DbValidator; +import org.graphybench.driver.driver.validation.ValidationParam; +import org.graphybench.driver.driver.validation.ValidationParamsFromJson; public class ValidateDatabaseMode implements DriverMode { private final ControlService controlService; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/formatter/SimpleDetailedWorkloadMetricsFormatter.java b/src/main/java/org/graphybench/driver/driver/formatter/SimpleDetailedWorkloadMetricsFormatter.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/formatter/SimpleDetailedWorkloadMetricsFormatter.java rename to src/main/java/org/graphybench/driver/driver/formatter/SimpleDetailedWorkloadMetricsFormatter.java index 66c365a06cf1eb22368ffc3843b68add6ed73be4..6e8d66179ca6c303e2dba6f97f095dd7a3436f90 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/formatter/SimpleDetailedWorkloadMetricsFormatter.java +++ b/src/main/java/org/graphybench/driver/driver/formatter/SimpleDetailedWorkloadMetricsFormatter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.formatter; +package org.graphybench.driver.driver.formatter; import com.google.common.collect.Lists; import java.text.DecimalFormat; @@ -23,10 +23,10 @@ import java.util.Collections; import java.util.List; import java.util.TimeZone; import java.util.concurrent.TimeUnit; -import org.ldbcouncil.finbench.driver.runtime.metrics.OperationMetricsSnapshot; -import org.ldbcouncil.finbench.driver.runtime.metrics.OperationTypeMetricsManager; -import org.ldbcouncil.finbench.driver.runtime.metrics.WorkloadResultsSnapshot; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.runtime.metrics.OperationMetricsSnapshot; +import org.graphybench.driver.driver.runtime.metrics.OperationTypeMetricsManager; +import org.graphybench.driver.driver.runtime.metrics.WorkloadResultsSnapshot; +import org.graphybench.driver.driver.temporal.TemporalUtil; public class SimpleDetailedWorkloadMetricsFormatter implements WorkloadMetricsFormatter { private static final String DEFAULT_NAME = ""; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/formatter/SimpleSummaryWorkloadMetricsFormatter.java b/src/main/java/org/graphybench/driver/driver/formatter/SimpleSummaryWorkloadMetricsFormatter.java similarity index 92% rename from src/main/java/org/ldbcouncil/finbench/driver/formatter/SimpleSummaryWorkloadMetricsFormatter.java rename to src/main/java/org/graphybench/driver/driver/formatter/SimpleSummaryWorkloadMetricsFormatter.java index 0d362a18d9d2ebcb0e2453924463b81990059d34..6399ff571f899e9bbe880f0cdf9d01b379368221 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/formatter/SimpleSummaryWorkloadMetricsFormatter.java +++ b/src/main/java/org/graphybench/driver/driver/formatter/SimpleSummaryWorkloadMetricsFormatter.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.formatter; +package org.graphybench.driver.driver.formatter; import com.google.common.collect.Lists; import java.text.DecimalFormat; import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; -import org.ldbcouncil.finbench.driver.runtime.metrics.OperationMetricsSnapshot; -import org.ldbcouncil.finbench.driver.runtime.metrics.OperationTypeMetricsManager; -import org.ldbcouncil.finbench.driver.runtime.metrics.WorkloadResultsSnapshot; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.runtime.metrics.OperationMetricsSnapshot; +import org.graphybench.driver.driver.runtime.metrics.OperationTypeMetricsManager; +import org.graphybench.driver.driver.runtime.metrics.WorkloadResultsSnapshot; +import org.graphybench.driver.driver.temporal.TemporalUtil; public class SimpleSummaryWorkloadMetricsFormatter implements WorkloadMetricsFormatter { private static final String DEFAULT_NAME = ""; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/formatter/WorkloadMetricsFormatter.java b/src/main/java/org/graphybench/driver/driver/formatter/WorkloadMetricsFormatter.java similarity index 85% rename from src/main/java/org/ldbcouncil/finbench/driver/formatter/WorkloadMetricsFormatter.java rename to src/main/java/org/graphybench/driver/driver/formatter/WorkloadMetricsFormatter.java index 856118b60a22d8bb2e349f9f4e53d3fc07b9433f..95b0ef3013a108b25f4dae8385ca7abf3298ecb4 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/formatter/WorkloadMetricsFormatter.java +++ b/src/main/java/org/graphybench/driver/driver/formatter/WorkloadMetricsFormatter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.formatter; +package org.graphybench.driver.driver.formatter; -import org.ldbcouncil.finbench.driver.runtime.metrics.WorkloadResultsSnapshot; +import org.graphybench.driver.driver.runtime.metrics.WorkloadResultsSnapshot; public interface WorkloadMetricsFormatter { String format(WorkloadResultsSnapshot workloadResultsSnapshot); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/BufferedIterator.java b/src/main/java/org/graphybench/driver/driver/generator/BufferedIterator.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/BufferedIterator.java rename to src/main/java/org/graphybench/driver/driver/generator/BufferedIterator.java index 2e90976fc58826794963aaffb609c7d1fa3de9a4..ee928c5eb86217a3f4e8621daedefde058b804bc 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/BufferedIterator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/BufferedIterator.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import static java.lang.String.format; import java.util.Collections; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.Operation; +import org.graphybench.driver.driver.Operation; public class BufferedIterator implements Iterator { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/ConstantGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/ConstantGenerator.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/ConstantGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/ConstantGenerator.java index 26cde020867b9f385356f16197e1555a37c9cd78..1d581d5d20b0db110382cc9ccc899dc5749b31da 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/ConstantGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/ConstantGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; public class ConstantGenerator extends Generator { private final GENERATE_TYPE thing; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/CsvEventStreamReaderBasicCharSeeker.java b/src/main/java/org/graphybench/driver/driver/generator/CsvEventStreamReaderBasicCharSeeker.java similarity index 91% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/CsvEventStreamReaderBasicCharSeeker.java rename to src/main/java/org/graphybench/driver/driver/generator/CsvEventStreamReaderBasicCharSeeker.java index 5b2e99b99cb08510be96f785b2b4871edc4d5e90..45e2885392a84e713c33595db7b49a8be5a9ba6e 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/CsvEventStreamReaderBasicCharSeeker.java +++ b/src/main/java/org/graphybench/driver/driver/generator/CsvEventStreamReaderBasicCharSeeker.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import static java.lang.String.format; import java.io.IOException; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.csv.charseeker.CharSeeker; -import org.ldbcouncil.finbench.driver.csv.charseeker.Extractors; -import org.ldbcouncil.finbench.driver.csv.charseeker.Mark; +import org.graphybench.driver.driver.csv.charseeker.CharSeeker; +import org.graphybench.driver.driver.csv.charseeker.Extractors; +import org.graphybench.driver.driver.csv.charseeker.Mark; public class CsvEventStreamReaderBasicCharSeeker implements Iterator { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/CsvEventStreamReaderTimedTypedCharSeeker.java b/src/main/java/org/graphybench/driver/driver/generator/CsvEventStreamReaderTimedTypedCharSeeker.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/CsvEventStreamReaderTimedTypedCharSeeker.java rename to src/main/java/org/graphybench/driver/driver/generator/CsvEventStreamReaderTimedTypedCharSeeker.java index 3c276b0cd1cf1e52f3da3dd03a0acb723be458c1..b6cadf9f60f38d1d59dc6d127b17f5121c4b9906 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/CsvEventStreamReaderTimedTypedCharSeeker.java +++ b/src/main/java/org/graphybench/driver/driver/generator/CsvEventStreamReaderTimedTypedCharSeeker.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import static java.lang.String.format; @@ -23,9 +23,9 @@ import java.io.IOException; import java.util.Iterator; import java.util.Map; import java.util.NoSuchElementException; -import org.ldbcouncil.finbench.driver.csv.charseeker.CharSeeker; -import org.ldbcouncil.finbench.driver.csv.charseeker.Extractors; -import org.ldbcouncil.finbench.driver.csv.charseeker.Mark; +import org.graphybench.driver.driver.csv.charseeker.CharSeeker; +import org.graphybench.driver.driver.csv.charseeker.Extractors; +import org.graphybench.driver.driver.csv.charseeker.Mark; public class CsvEventStreamReaderTimedTypedCharSeeker implements Iterator { private final EventDecoder[] decoders; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/CsvEventStreamReaderTimedTypedCsvReader.java b/src/main/java/org/graphybench/driver/driver/generator/CsvEventStreamReaderTimedTypedCsvReader.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/CsvEventStreamReaderTimedTypedCsvReader.java rename to src/main/java/org/graphybench/driver/driver/generator/CsvEventStreamReaderTimedTypedCsvReader.java index ef6388f6cee71f571f29067487043d7d3c58f860..39c5685d1649f3b855906a3d05345244e26ccb56 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/CsvEventStreamReaderTimedTypedCsvReader.java +++ b/src/main/java/org/graphybench/driver/driver/generator/CsvEventStreamReaderTimedTypedCsvReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import static java.lang.String.format; @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.Map; import java.util.NoSuchElementException; -import org.ldbcouncil.finbench.driver.util.Function1; +import org.graphybench.driver.driver.util.Function1; public class CsvEventStreamReaderTimedTypedCsvReader diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/DiscreteGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/DiscreteGenerator.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/DiscreteGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/DiscreteGenerator.java index cd9c2814c169a9e0b1ffc9e891034429fedd6abe..cd566d9a9e1b36b0dcc2799507c8f4e612e82690 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/DiscreteGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/DiscreteGenerator.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import static java.lang.String.format; import com.google.common.collect.Lists; import java.util.List; import org.apache.commons.math3.random.RandomDataGenerator; -import org.ldbcouncil.finbench.driver.util.Tuple2; +import org.graphybench.driver.driver.util.Tuple2; public class DiscreteGenerator extends Generator { private final Tuple2[] itemProbabilities; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/DiscreteListGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/DiscreteListGenerator.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/DiscreteListGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/DiscreteListGenerator.java index 8c3890216ea0a53d7daf859af59be6452b336676..8930a33b7ca0107a14bc07c989f20b264f17d42f 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/DiscreteListGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/DiscreteListGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import static java.lang.String.format; @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import org.apache.commons.math3.random.RandomDataGenerator; -import org.ldbcouncil.finbench.driver.util.Tuple2; +import org.graphybench.driver.driver.util.Tuple2; public class DiscreteListGenerator extends Generator> { // generates the number of items to be selected upon next() diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/DynamicRangeUniformNumberGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/DynamicRangeUniformNumberGenerator.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/DynamicRangeUniformNumberGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/DynamicRangeUniformNumberGenerator.java index 545fbd993bfa1a425cabda4367b40fdeb1d15e45..eef2f1ca6b28570b67b207ac0e973ea26517cde8 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/DynamicRangeUniformNumberGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/DynamicRangeUniformNumberGenerator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import org.apache.commons.math3.random.RandomDataGenerator; -import org.ldbcouncil.finbench.driver.util.NumberHelper; +import org.graphybench.driver.driver.util.NumberHelper; public class DynamicRangeUniformNumberGenerator extends Generator { private final MinMaxGenerator lowerBoundGenerator; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/EventStreamReader.java b/src/main/java/org/graphybench/driver/driver/generator/EventStreamReader.java similarity index 89% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/EventStreamReader.java rename to src/main/java/org/graphybench/driver/driver/generator/EventStreamReader.java index 3d89951957be47ec2fbea48cc11c44414bad6709..cb4d4ad45a260a0d109d79382a7a63bd160974d1 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/EventStreamReader.java +++ b/src/main/java/org/graphybench/driver/driver/generator/EventStreamReader.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import java.sql.ResultSet; -import org.ldbcouncil.finbench.driver.WorkloadException; +import org.graphybench.driver.driver.WorkloadException; public class EventStreamReader { public interface EventDecoder { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/ExponentialNumberGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/ExponentialNumberGenerator.java similarity index 93% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/ExponentialNumberGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/ExponentialNumberGenerator.java index e0d9bc84052f11ea231ebf74da823b2a477c139d..e76aeca9ee08d9c99f9a9857ae15f8e2d6094d67 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/ExponentialNumberGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/ExponentialNumberGenerator.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import org.apache.commons.math3.distribution.ExponentialDistribution; import org.apache.commons.math3.random.RandomDataGenerator; -import org.ldbcouncil.finbench.driver.util.NumberHelper; +import org.graphybench.driver.driver.util.NumberHelper; public class ExponentialNumberGenerator extends Generator { private final ExponentialDistribution exponentialDistribution; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/Generator.java b/src/main/java/org/graphybench/driver/driver/generator/Generator.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/Generator.java rename to src/main/java/org/graphybench/driver/driver/generator/Generator.java index c8b993865a257882a6e283f35f3a77af58cc3f89..22a40b4525f5f84510cd36a7cc12c79b61ffa0de 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/Generator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/Generator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/GeneratorException.java b/src/main/java/org/graphybench/driver/driver/generator/GeneratorException.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/GeneratorException.java rename to src/main/java/org/graphybench/driver/driver/generator/GeneratorException.java index d418ea8c2331be057e9cec3beed5492eb85895a5..255d4a4fe092e0918c854b8a01c6901a024429bc 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/GeneratorException.java +++ b/src/main/java/org/graphybench/driver/driver/generator/GeneratorException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; public class GeneratorException extends RuntimeException { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/GeneratorFactory.java b/src/main/java/org/graphybench/driver/driver/generator/GeneratorFactory.java similarity index 99% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/GeneratorFactory.java rename to src/main/java/org/graphybench/driver/driver/generator/GeneratorFactory.java index 01ed6a248fbd8f9e6fff4e42091af0fe183d299c..b7473fd83e677bf9346ac01e1a8553830a7419b3 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/GeneratorFactory.java +++ b/src/main/java/org/graphybench/driver/driver/generator/GeneratorFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import static java.lang.String.format; @@ -31,13 +31,13 @@ import java.util.List; import java.util.Map; import java.util.Set; import org.apache.commons.math3.random.RandomDataGenerator; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.util.Function0; -import org.ldbcouncil.finbench.driver.util.Function1; -import org.ldbcouncil.finbench.driver.util.Function2; -import org.ldbcouncil.finbench.driver.util.Tuple; -import org.ldbcouncil.finbench.driver.util.Tuple2; -import org.ldbcouncil.finbench.driver.util.Tuple3; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.util.Function0; +import org.graphybench.driver.driver.util.Function1; +import org.graphybench.driver.driver.util.Function2; +import org.graphybench.driver.driver.util.Tuple; +import org.graphybench.driver.driver.util.Tuple2; +import org.graphybench.driver.driver.util.Tuple3; public class GeneratorFactory { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/IdentityGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/IdentityGenerator.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/IdentityGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/IdentityGenerator.java index babb87a268a81c43fad908aaeb9c0f8171c3c5c5..abf8d4f05ce142195f91ad3d3c53b885ebe2e81d 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/IdentityGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/IdentityGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; public class IdentityGenerator extends Generator { private final GENERATE_TYPE[] things; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/IncrementingGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/IncrementingGenerator.java similarity index 93% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/IncrementingGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/IncrementingGenerator.java index bb9e2988476d3e6ffadc1e2a2ef5f81578e17159..10ae457662e4ce9213a9e46d5ddb3764c9f2c061 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/IncrementingGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/IncrementingGenerator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.util.NumberHelper; +import org.graphybench.driver.driver.util.NumberHelper; public class IncrementingGenerator extends Generator { private final NumberHelper number; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/InterleaveGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/InterleaveGenerator.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/InterleaveGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/InterleaveGenerator.java index 05250ad259db4792cb298666f5ce36eeb0099c54..d8f594709408d0dbda10cc6d5cc1820c8e0142bc 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/InterleaveGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/InterleaveGenerator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.util.Function0; +import org.graphybench.driver.driver.util.Function0; public class InterleaveGenerator extends Generator { private final Iterator baseGenerator; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/IteratorDereferencingGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/IteratorDereferencingGenerator.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/IteratorDereferencingGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/IteratorDereferencingGenerator.java index 476870b3bf733199dc85f3d7d3c8e2ecce938290..fc9ee52650b9740bb17dc3b1b7b68f408e838472 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/IteratorDereferencingGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/IteratorDereferencingGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import java.util.Iterator; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/LimitGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/LimitGenerator.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/LimitGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/LimitGenerator.java index f026c3f3970f2ea9d96711ba974a0524eb2ec38d..5acf9ce8f0e7108c498642afc5cec49cd0fd6aca 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/LimitGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/LimitGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import java.util.Iterator; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/MappingGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/MappingGenerator.java similarity index 93% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/MappingGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/MappingGenerator.java index dd478c50019798d6182c9d5b1d3b349f3a31dbe5..c4614d43c00f3876e914fe7fdceeff49a508642c 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/MappingGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/MappingGenerator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.util.Function1; +import org.graphybench.driver.driver.util.Function1; public class MappingGenerator extends Generator { private final Iterator fromGenerator; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/MergingGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/MergingGenerator.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/MergingGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/MergingGenerator.java index 24735315c168e99d3a1fbee4e76680167ae0e5f8..8fec024bd59191a704d1fc363180f50852884bbe 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/MergingGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/MergingGenerator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.util.Function2; +import org.graphybench.driver.driver.util.Function2; // TODO test public class MergingGenerator diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/MinMaxGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/MinMaxGenerator.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/MinMaxGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/MinMaxGenerator.java index 33fffc15e99a7756991979c9ecfe506f616fbb79..c855cb582187564fc9b2c1e6060545bb0f8dfa46 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/MinMaxGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/MinMaxGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import java.util.Iterator; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/NaiveBoundedRangeNumberGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/NaiveBoundedRangeNumberGenerator.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/NaiveBoundedRangeNumberGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/NaiveBoundedRangeNumberGenerator.java index 6e5165c4931fd9f421a4795a2cf84c34a94190b1..f64207929d040be58c5e8edefef773d7a4034831 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/NaiveBoundedRangeNumberGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/NaiveBoundedRangeNumberGenerator.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import static java.lang.String.format; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.util.NumberHelper; +import org.graphybench.driver.driver.util.NumberHelper; public class NaiveBoundedRangeNumberGenerator extends Generator { private final Integer maxIterations = 1000; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/NoRemoveIterator.java b/src/main/java/org/graphybench/driver/driver/generator/NoRemoveIterator.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/NoRemoveIterator.java rename to src/main/java/org/graphybench/driver/driver/generator/NoRemoveIterator.java index ca2ddc00c709a073976ea55e842465af062e6d79..07bde708974f02d6a2e804b540b3bd06b0a6f27d 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/NoRemoveIterator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/NoRemoveIterator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import static java.lang.String.format; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/OperationStreamBuffer.java b/src/main/java/org/graphybench/driver/driver/generator/OperationStreamBuffer.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/OperationStreamBuffer.java rename to src/main/java/org/graphybench/driver/driver/generator/OperationStreamBuffer.java index 265330c42486cda3084218b42b657e2290120f6e..bbc3a4d15fe555ca3d45212f7cf0277ae4b771a3 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/OperationStreamBuffer.java +++ b/src/main/java/org/graphybench/driver/driver/generator/OperationStreamBuffer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import java.util.Collections; import java.util.Iterator; import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; -import org.ldbcouncil.finbench.driver.Operation; +import org.graphybench.driver.driver.Operation; public class OperationStreamBuffer implements Iterator> { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/OrderedMultiGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/OrderedMultiGenerator.java similarity index 99% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/OrderedMultiGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/OrderedMultiGenerator.java index e955eb624d17ca2d00dbc2a8768d881da8e248da..9757da2f3ea59ed2b53d94ab6dfc5f05e479d4ce 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/OrderedMultiGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/OrderedMultiGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import java.util.ArrayList; import java.util.Comparator; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/RandomDataGeneratorFactory.java b/src/main/java/org/graphybench/driver/driver/generator/RandomDataGeneratorFactory.java similarity index 92% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/RandomDataGeneratorFactory.java rename to src/main/java/org/graphybench/driver/driver/generator/RandomDataGeneratorFactory.java index 183f0cff6484947b6609ed007bfde590ffbe40c3..b8491d167b438770756f6dc887953983adf82702 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/RandomDataGeneratorFactory.java +++ b/src/main/java/org/graphybench/driver/driver/generator/RandomDataGeneratorFactory.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import org.apache.commons.math3.random.RandomDataGenerator; import org.apache.commons.math3.random.RandomGenerator; import org.apache.commons.math3.random.Well19937c; -import org.ldbcouncil.finbench.driver.temporal.SystemTimeSource; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; +import org.graphybench.driver.driver.temporal.SystemTimeSource; +import org.graphybench.driver.driver.temporal.TimeSource; public class RandomDataGeneratorFactory { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/RepeatingGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/RepeatingGenerator.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/RepeatingGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/RepeatingGenerator.java index e8ef8c35b7c79745f25355e72b66dcd242da3be2..509834ec779be2e89fdbd91dedbbcb20e07b42da 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/RepeatingGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/RepeatingGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import com.google.common.collect.Lists; import java.util.Iterator; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/SizedUniformByteGeneratorGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/SizedUniformByteGeneratorGenerator.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/SizedUniformByteGeneratorGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/SizedUniformByteGeneratorGenerator.java index eaa4fe222508a7f906bad0f2ef20b59f43c04dd4..1517e7e80928013114e58fbf6b9b3b1a21e8b889 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/SizedUniformByteGeneratorGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/SizedUniformByteGeneratorGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import java.util.Iterator; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/TimeMappingOperationGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/TimeMappingOperationGenerator.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/TimeMappingOperationGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/TimeMappingOperationGenerator.java index 1a5e0b4ac2a77249a76731ac14b0a194622fdb75..62ba96110a630c2da30b3f934deaa7b858d81845 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/TimeMappingOperationGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/TimeMappingOperationGenerator.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.util.Function1; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.util.Function1; public class TimeMappingOperationGenerator extends Generator { private final Iterator operations; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/generator/UniformByteGenerator.java b/src/main/java/org/graphybench/driver/driver/generator/UniformByteGenerator.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/generator/UniformByteGenerator.java rename to src/main/java/org/graphybench/driver/driver/generator/UniformByteGenerator.java index a33f9e2b409d94d22f00b15aff601cd2b2c54695..f0cdd936f6c00c0e55136f40ed7360244085ecfe 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/generator/UniformByteGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/generator/UniformByteGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.generator; +package org.graphybench.driver.driver.generator; import org.apache.commons.math3.random.RandomDataGenerator; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/log/Log4jLoggingService.java b/src/main/java/org/graphybench/driver/driver/log/Log4jLoggingService.java similarity index 92% rename from src/main/java/org/ldbcouncil/finbench/driver/log/Log4jLoggingService.java rename to src/main/java/org/graphybench/driver/driver/log/Log4jLoggingService.java index 7ed783ba45260f08ca7faec803cd781a29335962..d233717e2d743ce9bfbde02a1f7bf3e91c8b25cd 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/log/Log4jLoggingService.java +++ b/src/main/java/org/graphybench/driver/driver/log/Log4jLoggingService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.log; +package org.graphybench.driver.driver.log; import java.text.DecimalFormat; import java.text.SimpleDateFormat; @@ -24,12 +24,12 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.config.Configurator; -import org.ldbcouncil.finbench.driver.formatter.SimpleDetailedWorkloadMetricsFormatter; -import org.ldbcouncil.finbench.driver.formatter.SimpleSummaryWorkloadMetricsFormatter; -import org.ldbcouncil.finbench.driver.formatter.WorkloadMetricsFormatter; -import org.ldbcouncil.finbench.driver.runtime.metrics.WorkloadResultsSnapshot; -import org.ldbcouncil.finbench.driver.runtime.metrics.WorkloadStatusSnapshot; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.formatter.SimpleDetailedWorkloadMetricsFormatter; +import org.graphybench.driver.driver.formatter.SimpleSummaryWorkloadMetricsFormatter; +import org.graphybench.driver.driver.formatter.WorkloadMetricsFormatter; +import org.graphybench.driver.driver.runtime.metrics.WorkloadResultsSnapshot; +import org.graphybench.driver.driver.runtime.metrics.WorkloadStatusSnapshot; +import org.graphybench.driver.driver.temporal.TemporalUtil; public class Log4jLoggingService implements LoggingService { private static final DecimalFormat OPERATION_COUNT_FORMATTER = new DecimalFormat("###,###,###,###"); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/log/Log4jLoggingServiceFactory.java b/src/main/java/org/graphybench/driver/driver/log/Log4jLoggingServiceFactory.java similarity index 88% rename from src/main/java/org/ldbcouncil/finbench/driver/log/Log4jLoggingServiceFactory.java rename to src/main/java/org/graphybench/driver/driver/log/Log4jLoggingServiceFactory.java index 6a915aaf3f80cef404d8d2b555aab80c57d025b4..10d7a13c44a603ecc180898f49bddec31b9b4a4a 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/log/Log4jLoggingServiceFactory.java +++ b/src/main/java/org/graphybench/driver/driver/log/Log4jLoggingServiceFactory.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.log; +package org.graphybench.driver.driver.log; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.temporal.TemporalUtil; /** - * The logging instance entry for FinBench. + * The logging instance entry for GraphyBench. * TODO: simplify this. Seems no need to use a factory */ public class Log4jLoggingServiceFactory implements LoggingServiceFactory { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/log/LoggingService.java b/src/main/java/org/graphybench/driver/driver/log/LoggingService.java similarity index 83% rename from src/main/java/org/ldbcouncil/finbench/driver/log/LoggingService.java rename to src/main/java/org/graphybench/driver/driver/log/LoggingService.java index 7303cf1d390b6618810c63b642b6afa2d922b7f8..5bd249692605ba2886f69f87d078ef59dde8caa0 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/log/LoggingService.java +++ b/src/main/java/org/graphybench/driver/driver/log/LoggingService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.log; +package org.graphybench.driver.driver.log; -import org.ldbcouncil.finbench.driver.runtime.metrics.WorkloadResultsSnapshot; -import org.ldbcouncil.finbench.driver.runtime.metrics.WorkloadStatusSnapshot; +import org.graphybench.driver.driver.runtime.metrics.WorkloadResultsSnapshot; +import org.graphybench.driver.driver.runtime.metrics.WorkloadStatusSnapshot; public interface LoggingService { void info(String message); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/log/LoggingServiceFactory.java b/src/main/java/org/graphybench/driver/driver/log/LoggingServiceFactory.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/log/LoggingServiceFactory.java rename to src/main/java/org/graphybench/driver/driver/log/LoggingServiceFactory.java index 115e9483d10c7548b620f0a3255ac141f8cba5f4..ae815832fbbf0f2c0a13d6f2d68146c61ef5aca6 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/log/LoggingServiceFactory.java +++ b/src/main/java/org/graphybench/driver/driver/log/LoggingServiceFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.log; +package org.graphybench.driver.driver.log; public interface LoggingServiceFactory { LoggingService loggingServiceFor(String source); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/log/RecentThroughputAndDuration.java b/src/main/java/org/graphybench/driver/driver/log/RecentThroughputAndDuration.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/log/RecentThroughputAndDuration.java rename to src/main/java/org/graphybench/driver/driver/log/RecentThroughputAndDuration.java index 4ce39f3f7ee24ae234332d009e33e846f2b41b61..36f9361c5772e73cdb6efb27f2a2dacf4a0759ac 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/log/RecentThroughputAndDuration.java +++ b/src/main/java/org/graphybench/driver/driver/log/RecentThroughputAndDuration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.log; +package org.graphybench.driver.driver.log; public interface RecentThroughputAndDuration { double throughput(); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/result/Path.java b/src/main/java/org/graphybench/driver/driver/result/Path.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/result/Path.java rename to src/main/java/org/graphybench/driver/driver/result/Path.java index 9c0f56c9c150fc81493ea37375b1fe3611de90af..4799d778df77555daaaa65d6d630ac5d0b6685b2 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/result/Path.java +++ b/src/main/java/org/graphybench/driver/driver/result/Path.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.result; +package org.graphybench.driver.driver.result; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/result/PathDeserializer.java b/src/main/java/org/graphybench/driver/driver/result/PathDeserializer.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/result/PathDeserializer.java rename to src/main/java/org/graphybench/driver/driver/result/PathDeserializer.java index 7c178abb86c45500f28b9f8c57c5778ad6c1962d..0400b01f1d39b1e9473465666478627657dfa7e2 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/result/PathDeserializer.java +++ b/src/main/java/org/graphybench/driver/driver/result/PathDeserializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.result; +package org.graphybench.driver.driver.result; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/result/PathSerializer.java b/src/main/java/org/graphybench/driver/driver/result/PathSerializer.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/result/PathSerializer.java rename to src/main/java/org/graphybench/driver/driver/result/PathSerializer.java index e4d19071218bf4f94d624f2e4935000350fc0ab6..4333ee8b4c92f1675f1b4a68d66cc5ae6132e029 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/result/PathSerializer.java +++ b/src/main/java/org/graphybench/driver/driver/result/PathSerializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.result; +package org.graphybench.driver.driver.result; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/ConcurrentErrorReporter.java b/src/main/java/org/graphybench/driver/driver/runtime/ConcurrentErrorReporter.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/ConcurrentErrorReporter.java rename to src/main/java/org/graphybench/driver/driver/runtime/ConcurrentErrorReporter.java index 3af7a1747ffbbb539834007e0440f85b80f56811..333186579c3c9f5426bc1cafe71c7159355f1944 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/ConcurrentErrorReporter.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/ConcurrentErrorReporter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime; +package org.graphybench.driver.driver.runtime; import static java.lang.String.format; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/DefaultQueues.java b/src/main/java/org/graphybench/driver/driver/runtime/DefaultQueues.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/DefaultQueues.java rename to src/main/java/org/graphybench/driver/driver/runtime/DefaultQueues.java index 10845192f504edf22e491410c4cd5c95fc3015cf..81fc6063c4b733fdd26f29cb4b2643d8db58feae 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/DefaultQueues.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/DefaultQueues.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime; +package org.graphybench.driver.driver.runtime; import java.util.Queue; import java.util.concurrent.BlockingQueue; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/QueueEventFetcher.java b/src/main/java/org/graphybench/driver/driver/runtime/QueueEventFetcher.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/QueueEventFetcher.java rename to src/main/java/org/graphybench/driver/driver/runtime/QueueEventFetcher.java index eb2d58a7886f1631de679fbda9c07005dfdcfec5..7e233ed5b5bf48df3bfb8d3a4f97a87f66cd1fed 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/QueueEventFetcher.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/QueueEventFetcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime; +package org.graphybench.driver.driver.runtime; import java.util.Queue; import java.util.concurrent.BlockingQueue; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/QueueEventSubmitter.java b/src/main/java/org/graphybench/driver/driver/runtime/QueueEventSubmitter.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/QueueEventSubmitter.java rename to src/main/java/org/graphybench/driver/driver/runtime/QueueEventSubmitter.java index 4819651e17332fce63283bc29409f92076757d93..d2fd99362b36cbb908815b27811d43406086a644 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/QueueEventSubmitter.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/QueueEventSubmitter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime; +package org.graphybench.driver.driver.runtime; import java.util.Queue; import java.util.concurrent.BlockingQueue; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/SimpleResultsLogWriter.java b/src/main/java/org/graphybench/driver/driver/runtime/SimpleResultsLogWriter.java similarity index 91% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/SimpleResultsLogWriter.java rename to src/main/java/org/graphybench/driver/driver/runtime/SimpleResultsLogWriter.java index d2b93a9575cbbae66ecc9085a79eb761c3ac3079..961637ccd14ea55161cf84e2460ea86c1468bac8 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/SimpleResultsLogWriter.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/SimpleResultsLogWriter.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime; +package org.graphybench.driver.driver.runtime; import java.io.File; import java.io.IOException; import java.util.concurrent.TimeUnit; -import org.ldbcouncil.finbench.driver.csv.simple.SimpleCsvFileWriter; -import org.ldbcouncil.finbench.driver.runtime.metrics.ResultsLogWriter; +import org.graphybench.driver.driver.csv.simple.SimpleCsvFileWriter; +import org.graphybench.driver.driver.runtime.metrics.ResultsLogWriter; public class SimpleResultsLogWriter implements ResultsLogWriter { private final SimpleCsvFileWriter writer; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/WorkloadRunner.java b/src/main/java/org/graphybench/driver/driver/runtime/WorkloadRunner.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/WorkloadRunner.java rename to src/main/java/org/graphybench/driver/driver/runtime/WorkloadRunner.java index 405bc862ab761d7ce0bf2a80891015a5ba8932e4..b8646c0dd837b9987f5da5e62c2cdabd9cfc5e67 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/WorkloadRunner.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/WorkloadRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime; +package org.graphybench.driver.driver.runtime; import static java.lang.String.format; @@ -26,22 +26,22 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import org.ldbcouncil.finbench.driver.Db; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.WorkloadStreams; -import org.ldbcouncil.finbench.driver.log.LoggingServiceFactory; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeException; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeService; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeWriter; -import org.ldbcouncil.finbench.driver.runtime.coordination.DummyCompletionTimeWriter; -import org.ldbcouncil.finbench.driver.runtime.executor.OperationExecutor; -import org.ldbcouncil.finbench.driver.runtime.executor.OperationExecutorException; -import org.ldbcouncil.finbench.driver.runtime.executor.OperationStreamExecutorService; -import org.ldbcouncil.finbench.driver.runtime.executor.ThreadPoolOperationExecutor; -import org.ldbcouncil.finbench.driver.runtime.metrics.MetricsCollectionException; -import org.ldbcouncil.finbench.driver.runtime.metrics.MetricsService; -import org.ldbcouncil.finbench.driver.runtime.scheduling.Spinner; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; +import org.graphybench.driver.driver.Db; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.WorkloadStreams; +import org.graphybench.driver.driver.log.LoggingServiceFactory; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeException; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeService; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeWriter; +import org.graphybench.driver.driver.runtime.coordination.DummyCompletionTimeWriter; +import org.graphybench.driver.driver.runtime.executor.OperationExecutor; +import org.graphybench.driver.driver.runtime.executor.OperationExecutorException; +import org.graphybench.driver.driver.runtime.executor.OperationStreamExecutorService; +import org.graphybench.driver.driver.runtime.executor.ThreadPoolOperationExecutor; +import org.graphybench.driver.driver.runtime.metrics.MetricsCollectionException; +import org.graphybench.driver.driver.runtime.metrics.MetricsService; +import org.graphybench.driver.driver.runtime.scheduling.Spinner; +import org.graphybench.driver.driver.temporal.TimeSource; public class WorkloadRunner { static final long RUNNER_POLLING_INTERVAL_AS_MILLI = 100; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/WorkloadStatusThread.java b/src/main/java/org/graphybench/driver/driver/runtime/WorkloadStatusThread.java similarity index 91% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/WorkloadStatusThread.java rename to src/main/java/org/graphybench/driver/driver/runtime/WorkloadStatusThread.java index f281171492b203629ce8a8e724a3c8e9cb170fc9..2932c8aba53fa16ff39ed03d78fe3ea46d3804bd 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/WorkloadStatusThread.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/WorkloadStatusThread.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime; +package org.graphybench.driver.driver.runtime; import static java.lang.String.format; import java.util.concurrent.atomic.AtomicBoolean; -import org.ldbcouncil.finbench.driver.log.LoggingService; -import org.ldbcouncil.finbench.driver.log.LoggingServiceFactory; -import org.ldbcouncil.finbench.driver.log.RecentThroughputAndDuration; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeService; -import org.ldbcouncil.finbench.driver.runtime.metrics.MetricsService; -import org.ldbcouncil.finbench.driver.runtime.metrics.WorkloadStatusSnapshot; -import org.ldbcouncil.finbench.driver.runtime.scheduling.Spinner; +import org.graphybench.driver.driver.log.LoggingService; +import org.graphybench.driver.driver.log.LoggingServiceFactory; +import org.graphybench.driver.driver.log.RecentThroughputAndDuration; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeService; +import org.graphybench.driver.driver.runtime.metrics.MetricsService; +import org.graphybench.driver.driver.runtime.metrics.WorkloadStatusSnapshot; +import org.graphybench.driver.driver.runtime.scheduling.Spinner; class WorkloadStatusThread extends Thread { private final long statusUpdateIntervalAsMilli; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeEvent.java b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeEvent.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeEvent.java rename to src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeEvent.java index 6c35b1b7b52e25681611320e773b30c04e295e12..c8dfe5c2758507a98288f03d44bf4e0526e1cc2e 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeEvent.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeEvent.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.coordination; +package org.graphybench.driver.driver.runtime.coordination; -import org.ldbcouncil.finbench.driver.runtime.coordination.ThreadedQueuedCompletionTimeService.CompletionTimeFuture; -import org.ldbcouncil.finbench.driver.runtime.coordination.ThreadedQueuedCompletionTimeService.CompletionTimeWriterFuture; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.runtime.coordination.ThreadedQueuedCompletionTimeService.CompletionTimeFuture; +import org.graphybench.driver.driver.runtime.coordination.ThreadedQueuedCompletionTimeService.CompletionTimeWriterFuture; +import org.graphybench.driver.driver.temporal.TemporalUtil; abstract class CompletionTimeEvent { static InitiatedTimeEvent writeInitiatedTime(int completionTimeWriterId, long timeAsMilli) { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeException.java b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeException.java similarity index 93% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeException.java rename to src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeException.java index ada5d1cebc6548f7311a68b7d53ddf114ddc7840..ea09878714e27d6839833ef5eb3cb73692fad092 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeException.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.coordination; +package org.graphybench.driver.driver.runtime.coordination; public class CompletionTimeException extends Exception { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeReader.java b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeReader.java similarity index 93% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeReader.java rename to src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeReader.java index 58551935abc31cd200f33cd7c5027aef78faa25a..20542c04700fc339034c5460394fd02fe98a7b92 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeReader.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.coordination; +package org.graphybench.driver.driver.runtime.coordination; public interface CompletionTimeReader { long lastKnownLowestInitiatedTimeAsMilli() throws CompletionTimeException; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeReaderWriter.java b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeReaderWriter.java similarity index 92% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeReaderWriter.java rename to src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeReaderWriter.java index 390e7f76b585c693141dd724e2bb672652e92e70..5c142e934bb87b2cc7e0d1b326c5686e115af349 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeReaderWriter.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeReaderWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.coordination; +package org.graphybench.driver.driver.runtime.coordination; public interface CompletionTimeReaderWriter extends CompletionTimeReader, CompletionTimeWriter { } diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeService.java b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeService.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeService.java rename to src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeService.java index 7f9cdbe7c6f70b872dc97c28b3d953f95358aa8d..ba082761c9638749c0e7b9155c23cbcb714265f9 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeService.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.coordination; +package org.graphybench.driver.driver.runtime.coordination; import java.util.List; import java.util.concurrent.Future; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeServiceAssistant.java b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeServiceAssistant.java similarity index 91% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeServiceAssistant.java rename to src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeServiceAssistant.java index 5086f4fdc2287780496c8ab9719bad2491d6eea0..5a2a9499e5bd6322bc0bc351a78088edfd93684b 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeServiceAssistant.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeServiceAssistant.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.coordination; +package org.graphybench.driver.driver.runtime.coordination; import java.util.List; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; -import org.ldbcouncil.finbench.driver.runtime.scheduling.Spinner; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.scheduling.Spinner; +import org.graphybench.driver.driver.temporal.TimeSource; public class CompletionTimeServiceAssistant { public void writeInitiatedAndCompletedTimesToAllWriters( diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeStateManager.java b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeStateManager.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeStateManager.java rename to src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeStateManager.java index acf814f6e3915e18522bd8e3ea4d950e19b469eb..481018d0f394ccb4b479f4d40c26cf6a8ccfdcaf 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeStateManager.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeStateManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.coordination; +package org.graphybench.driver.driver.runtime.coordination; import static java.lang.String.format; @@ -24,9 +24,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; -import org.ldbcouncil.finbench.driver.util.Function1; -import org.ldbcouncil.finbench.driver.util.Function2; +import org.graphybench.driver.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.util.Function1; +import org.graphybench.driver.driver.util.Function2; /** * Completion time is the point in time AT which there are no uncompleted events. @@ -74,7 +74,7 @@ public class CompletionTimeStateManager implements CompletionTimeReaderWriter { * Logs the new completed time and updates completion time accordingly. * * @param timeAsMilli - * @throws org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeException + * @throws CompletionTimeException */ @Override public void submitCompletedTime(long timeAsMilli) throws CompletionTimeException { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeWriter.java b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeWriter.java similarity index 93% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeWriter.java rename to src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeWriter.java index 61c2dce60a6d1e5b07b62f321ce629a874acd333..037b48cfd4b2516ee04343a7805fb72d4811b6e5 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/CompletionTimeWriter.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/coordination/CompletionTimeWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.coordination; +package org.graphybench.driver.driver.runtime.coordination; public interface CompletionTimeWriter { void submitInitiatedTime(long timeAsMilli) throws CompletionTimeException; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/DummyCompletionTimeWriter.java b/src/main/java/org/graphybench/driver/driver/runtime/coordination/DummyCompletionTimeWriter.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/DummyCompletionTimeWriter.java rename to src/main/java/org/graphybench/driver/driver/runtime/coordination/DummyCompletionTimeWriter.java index f47e1df5c007be2ebd78d5e3d2421e90921a9c07..84f94f32c007febccf87b2ed34bf6b13334c2545 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/DummyCompletionTimeWriter.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/coordination/DummyCompletionTimeWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.coordination; +package org.graphybench.driver.driver.runtime.coordination; public class DummyCompletionTimeWriter implements CompletionTimeWriter { @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/MultiWriterCompletionTimeStateManager.java b/src/main/java/org/graphybench/driver/driver/runtime/coordination/MultiWriterCompletionTimeStateManager.java similarity index 99% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/MultiWriterCompletionTimeStateManager.java rename to src/main/java/org/graphybench/driver/driver/runtime/coordination/MultiWriterCompletionTimeStateManager.java index 23ff4e0a44497cde7c5e58fd22dd3edcd7eedf42..399e88e913b06f76b0827d7013ab7e9768a9665b 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/MultiWriterCompletionTimeStateManager.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/coordination/MultiWriterCompletionTimeStateManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.coordination; +package org.graphybench.driver.driver.runtime.coordination; import static java.lang.String.format; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/MultiWriterCompletionTimeStateManagerWriter.java b/src/main/java/org/graphybench/driver/driver/runtime/coordination/MultiWriterCompletionTimeStateManagerWriter.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/MultiWriterCompletionTimeStateManagerWriter.java rename to src/main/java/org/graphybench/driver/driver/runtime/coordination/MultiWriterCompletionTimeStateManagerWriter.java index f9701cf524f828bf5253a2bb1f06b7e92acc9dad..7f5cad62fa22deab5c7eecd48472d4c4971c585c 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/MultiWriterCompletionTimeStateManagerWriter.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/coordination/MultiWriterCompletionTimeStateManagerWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.coordination; +package org.graphybench.driver.driver.runtime.coordination; public class MultiWriterCompletionTimeStateManagerWriter implements CompletionTimeWriter { private final int id; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/SynchronizedCompletionTimeService.java b/src/main/java/org/graphybench/driver/driver/runtime/coordination/SynchronizedCompletionTimeService.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/SynchronizedCompletionTimeService.java rename to src/main/java/org/graphybench/driver/driver/runtime/coordination/SynchronizedCompletionTimeService.java index 09881d2914f8a0c947f380262dae10b84b930d41..0eb78118e961279eb5a85bd368228b99b8523b6a 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/SynchronizedCompletionTimeService.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/coordination/SynchronizedCompletionTimeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.coordination; +package org.graphybench.driver.driver.runtime.coordination; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/ThreadedQueuedCompletionTimeService.java b/src/main/java/org/graphybench/driver/driver/runtime/coordination/ThreadedQueuedCompletionTimeService.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/ThreadedQueuedCompletionTimeService.java rename to src/main/java/org/graphybench/driver/driver/runtime/coordination/ThreadedQueuedCompletionTimeService.java index 7cb901bcaefcda43df32e2899f689939380be466..f88c6338e670bece0f9f9336332d7dd2e7e71b1b 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/ThreadedQueuedCompletionTimeService.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/coordination/ThreadedQueuedCompletionTimeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.coordination; +package org.graphybench.driver.driver.runtime.coordination; import static java.lang.String.format; @@ -27,11 +27,11 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; -import org.ldbcouncil.finbench.driver.runtime.DefaultQueues; -import org.ldbcouncil.finbench.driver.runtime.QueueEventSubmitter; -import org.ldbcouncil.finbench.driver.runtime.scheduling.Spinner; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.DefaultQueues; +import org.graphybench.driver.driver.runtime.QueueEventSubmitter; +import org.graphybench.driver.driver.runtime.scheduling.Spinner; +import org.graphybench.driver.driver.temporal.TimeSource; public class ThreadedQueuedCompletionTimeService implements CompletionTimeService { private static final long SHUTDOWN_WAIT_TIMEOUT_AS_MILLI = TimeUnit.SECONDS.toMillis(10); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/ThreadedQueuedCompletionTimeServiceThread.java b/src/main/java/org/graphybench/driver/driver/runtime/coordination/ThreadedQueuedCompletionTimeServiceThread.java similarity index 90% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/ThreadedQueuedCompletionTimeServiceThread.java rename to src/main/java/org/graphybench/driver/driver/runtime/coordination/ThreadedQueuedCompletionTimeServiceThread.java index 3c96a0eb100985cd7cc1abc8457fe37334f67019..02b2f8155133303c5a60b7e8fecce7e72c3d5241 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/coordination/ThreadedQueuedCompletionTimeServiceThread.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/coordination/ThreadedQueuedCompletionTimeServiceThread.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.coordination; +package org.graphybench.driver.driver.runtime.coordination; import static java.lang.String.format; @@ -23,15 +23,15 @@ import java.util.Map; import java.util.Queue; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; -import org.ldbcouncil.finbench.driver.runtime.QueueEventFetcher; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeEvent.CompletedTimeEvent; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeEvent.CompletionTimeFutureEvent; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeEvent.InitiatedTimeEvent; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeEvent.NewCompletionTimeWriterEvent; -import org.ldbcouncil.finbench.driver.runtime.coordination.ThreadedQueuedCompletionTimeService.CompletionTimeFuture; -import org.ldbcouncil.finbench.driver.runtime.coordination.ThreadedQueuedCompletionTimeService.CompletionTimeWriterFuture; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.QueueEventFetcher; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeEvent.CompletedTimeEvent; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeEvent.CompletionTimeFutureEvent; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeEvent.InitiatedTimeEvent; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeEvent.NewCompletionTimeWriterEvent; +import org.graphybench.driver.driver.runtime.coordination.ThreadedQueuedCompletionTimeService.CompletionTimeFuture; +import org.graphybench.driver.driver.runtime.coordination.ThreadedQueuedCompletionTimeService.CompletionTimeWriterFuture; +import org.graphybench.driver.driver.temporal.TemporalUtil; public class ThreadedQueuedCompletionTimeServiceThread extends Thread { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/ChildOperationExecutor.java b/src/main/java/org/graphybench/driver/driver/runtime/executor/ChildOperationExecutor.java similarity index 85% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/ChildOperationExecutor.java rename to src/main/java/org/graphybench/driver/driver/runtime/executor/ChildOperationExecutor.java index 8a4951ff560f960d8cf9a400a57a1ac2237faff3..b62b9fd08ecdce90c3402f4ecb357f1f521eaf42 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/ChildOperationExecutor.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/executor/ChildOperationExecutor.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.executor; +package org.graphybench.driver.driver.runtime.executor; -import org.ldbcouncil.finbench.driver.ChildOperationGenerator; -import org.ldbcouncil.finbench.driver.DbException; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.OperationHandlerRunnableContext; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeException; +import org.graphybench.driver.driver.ChildOperationGenerator; +import org.graphybench.driver.driver.DbException; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.OperationHandlerRunnableContext; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeException; public class ChildOperationExecutor { public void execute( diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/InitiatedTimeSubmittingOperationRetriever.java b/src/main/java/org/graphybench/driver/driver/runtime/executor/InitiatedTimeSubmittingOperationRetriever.java similarity index 92% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/InitiatedTimeSubmittingOperationRetriever.java rename to src/main/java/org/graphybench/driver/driver/runtime/executor/InitiatedTimeSubmittingOperationRetriever.java index 4824ef90e9472c5d095a7f0829f6dd5d6cf0dbda..8eb04dd189355cd9a37bf9077811d69c1ed8aa17 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/InitiatedTimeSubmittingOperationRetriever.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/executor/InitiatedTimeSubmittingOperationRetriever.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.executor; +package org.graphybench.driver.driver.runtime.executor; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.WorkloadStreams; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeException; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeWriter; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.WorkloadStreams; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeException; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeWriter; class InitiatedTimeSubmittingOperationRetriever { private final Iterator nonDependencyOperations; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/OperationExecutor.java b/src/main/java/org/graphybench/driver/driver/runtime/executor/OperationExecutor.java similarity index 91% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/OperationExecutor.java rename to src/main/java/org/graphybench/driver/driver/runtime/executor/OperationExecutor.java index f4af587b940f66476e34e56075508573111b42a2..7277e85ead2a29601a5daf509678b4d96b727916 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/OperationExecutor.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/executor/OperationExecutor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.executor; +package org.graphybench.driver.driver.runtime.executor; -import org.ldbcouncil.finbench.driver.Operation; +import org.graphybench.driver.driver.Operation; public interface OperationExecutor { /** diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/OperationExecutorException.java b/src/main/java/org/graphybench/driver/driver/runtime/executor/OperationExecutorException.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/OperationExecutorException.java rename to src/main/java/org/graphybench/driver/driver/runtime/executor/OperationExecutorException.java index 47aefc0f3c294ee343025b561b61e9511489c293..f7ebefbca5f5cb6476eeb883acd261c83529acad 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/OperationExecutorException.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/executor/OperationExecutorException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.executor; +package org.graphybench.driver.driver.runtime.executor; public class OperationExecutorException extends Exception { private static final long serialVersionUID = -5243628117143814942L; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/OperationHandlerRunnableContextRetriever.java b/src/main/java/org/graphybench/driver/driver/runtime/executor/OperationHandlerRunnableContextRetriever.java similarity index 79% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/OperationHandlerRunnableContextRetriever.java rename to src/main/java/org/graphybench/driver/driver/runtime/executor/OperationHandlerRunnableContextRetriever.java index e6e1e28e7f0d83c0c1d52ae6202d9423d61a0180..71a2037a245b7b44b556a19ea29ce9ab6ca1cbc0 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/OperationHandlerRunnableContextRetriever.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/executor/OperationHandlerRunnableContextRetriever.java @@ -14,26 +14,26 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.executor; +package org.graphybench.driver.driver.runtime.executor; import static java.lang.String.format; import java.util.Set; -import org.ldbcouncil.finbench.driver.Db; -import org.ldbcouncil.finbench.driver.DbException; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.OperationHandlerRunnableContext; -import org.ldbcouncil.finbench.driver.WorkloadStreams; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeException; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeReader; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeWriter; -import org.ldbcouncil.finbench.driver.runtime.coordination.DummyCompletionTimeWriter; -import org.ldbcouncil.finbench.driver.runtime.metrics.MetricsService; -import org.ldbcouncil.finbench.driver.runtime.scheduling.CtDependencyCheck; -import org.ldbcouncil.finbench.driver.runtime.scheduling.Spinner; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; +import org.graphybench.driver.driver.Db; +import org.graphybench.driver.driver.DbException; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.OperationHandlerRunnableContext; +import org.graphybench.driver.driver.WorkloadStreams; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeException; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeReader; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeWriter; +import org.graphybench.driver.driver.runtime.coordination.DummyCompletionTimeWriter; +import org.graphybench.driver.driver.runtime.metrics.MetricsService; +import org.graphybench.driver.driver.runtime.scheduling.CtDependencyCheck; +import org.graphybench.driver.driver.runtime.scheduling.Spinner; +import org.graphybench.driver.driver.temporal.TimeSource; // TODO test class OperationHandlerRunnableContextRetriever { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/OperationStreamExecutorService.java b/src/main/java/org/graphybench/driver/driver/runtime/executor/OperationStreamExecutorService.java similarity index 92% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/OperationStreamExecutorService.java rename to src/main/java/org/graphybench/driver/driver/runtime/executor/OperationStreamExecutorService.java index 8d04bce7f5770665b7a03537c20ee6a6afa8ba80..a3441346a6a013909c94fc3d19a2703fe698c000 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/OperationStreamExecutorService.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/executor/OperationStreamExecutorService.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.executor; +package org.graphybench.driver.driver.runtime.executor; import static java.lang.String.format; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.ldbcouncil.finbench.driver.WorkloadStreams; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeWriter; +import org.graphybench.driver.driver.WorkloadStreams; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeWriter; public class OperationStreamExecutorService { public static final long SHUTDOWN_WAIT_TIMEOUT_AS_MILLI = TimeUnit.SECONDS.toMillis(10); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/OperationStreamExecutorServiceThread.java b/src/main/java/org/graphybench/driver/driver/runtime/executor/OperationStreamExecutorServiceThread.java similarity index 88% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/OperationStreamExecutorServiceThread.java rename to src/main/java/org/graphybench/driver/driver/runtime/executor/OperationStreamExecutorServiceThread.java index 8b7cd1c55e5a0fe6d03cabd308b34e3bbe25ce0a..18c8ea625cdca855729c3cc08e91153c0911f1bd 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/OperationStreamExecutorServiceThread.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/executor/OperationStreamExecutorServiceThread.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.executor; +package org.graphybench.driver.driver.runtime.executor; import java.util.concurrent.atomic.AtomicBoolean; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.WorkloadStreams; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeWriter; -import org.ldbcouncil.finbench.driver.runtime.scheduling.Spinner; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.WorkloadStreams; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeWriter; +import org.graphybench.driver.driver.runtime.scheduling.Spinner; class OperationStreamExecutorServiceThread extends Thread { private static final long POLL_INTERVAL_WHILE_WAITING_FOR_LAST_HANDLER_TO_FINISH_AS_MILLI = 100; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/ThreadPoolOperationExecutor.java b/src/main/java/org/graphybench/driver/driver/runtime/executor/ThreadPoolOperationExecutor.java similarity index 91% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/ThreadPoolOperationExecutor.java rename to src/main/java/org/graphybench/driver/driver/runtime/executor/ThreadPoolOperationExecutor.java index 9ce29aaf1af0b88df31857f097db4373be0f8720..7573b7d73e27ac5bd7628cc58b20b8d567d8c007 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/executor/ThreadPoolOperationExecutor.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/executor/ThreadPoolOperationExecutor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.executor; +package org.graphybench.driver.driver.runtime.executor; import static java.lang.String.format; @@ -26,18 +26,18 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import org.ldbcouncil.finbench.driver.ChildOperationGenerator; -import org.ldbcouncil.finbench.driver.Db; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.OperationHandlerRunnableContext; -import org.ldbcouncil.finbench.driver.WorkloadStreams; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; -import org.ldbcouncil.finbench.driver.runtime.DefaultQueues; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeReader; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeWriter; -import org.ldbcouncil.finbench.driver.runtime.metrics.MetricsService; -import org.ldbcouncil.finbench.driver.runtime.scheduling.Spinner; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; +import org.graphybench.driver.driver.ChildOperationGenerator; +import org.graphybench.driver.driver.Db; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.OperationHandlerRunnableContext; +import org.graphybench.driver.driver.WorkloadStreams; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.DefaultQueues; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeReader; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeWriter; +import org.graphybench.driver.driver.runtime.metrics.MetricsService; +import org.graphybench.driver.driver.runtime.scheduling.Spinner; +import org.graphybench.driver.driver.temporal.TimeSource; public class ThreadPoolOperationExecutor implements OperationExecutor { private final ExecutorService threadPoolExecutorService; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/ContinuousMetricManager.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/ContinuousMetricManager.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/ContinuousMetricManager.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/ContinuousMetricManager.java index b851ddc6eed8956ac6a9f0515b2032d279ed4bb1..85b662d5ffc8dd8055fef512f8cc569ae7c00d69 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/ContinuousMetricManager.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/ContinuousMetricManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import java.util.concurrent.TimeUnit; import org.HdrHistogram.Histogram; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/ContinuousMetricSnapshot.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/ContinuousMetricSnapshot.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/ContinuousMetricSnapshot.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/ContinuousMetricSnapshot.java index 0cec0dca60bbed3c50ac241069787a95f07afba2..e10f0909da535a10332f2a1ff79edcb76fdb589d 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/ContinuousMetricSnapshot.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/ContinuousMetricSnapshot.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DiscreteMetricManager.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/DiscreteMetricManager.java similarity index 92% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DiscreteMetricManager.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/DiscreteMetricManager.java index c2030db236ef8e0c1d0e2ef7db08548e6529a16e..4fd731a959821359047ff55b114b20515ae80cc7 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DiscreteMetricManager.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/DiscreteMetricManager.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import org.ldbcouncil.finbench.driver.util.Bucket; -import org.ldbcouncil.finbench.driver.util.Histogram; +import org.graphybench.driver.driver.util.Bucket; +import org.graphybench.driver.driver.util.Histogram; public class DiscreteMetricManager { private final Histogram measurements; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DiscreteMetricSnapshot.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/DiscreteMetricSnapshot.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DiscreteMetricSnapshot.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/DiscreteMetricSnapshot.java index 9846d3bad1e848b4a183e196889027ad3aeca7d0..776939d3fa5a9224817daa951fba83031af95d1d 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DiscreteMetricSnapshot.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/DiscreteMetricSnapshot.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DisruptorExceptionHandler.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/DisruptorExceptionHandler.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DisruptorExceptionHandler.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/DisruptorExceptionHandler.java index 879b77c938dfadc2261040efd08faa81b3f5557a..fb16f40af9d7be2f27ebe943e20cefdef4f3e629 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DisruptorExceptionHandler.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/DisruptorExceptionHandler.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import static java.lang.String.format; import com.lmax.disruptor.ExceptionHandler; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; public class DisruptorExceptionHandler implements ExceptionHandler { private final ConcurrentErrorReporter errorReporter; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DisruptorSbeMetricsEvent.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/DisruptorSbeMetricsEvent.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DisruptorSbeMetricsEvent.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/DisruptorSbeMetricsEvent.java index b9deb98ee5d984c43c5dcbdf364f45c07d2f2d1d..0041073efa00883043986b569b89243a06682e6f 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DisruptorSbeMetricsEvent.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/DisruptorSbeMetricsEvent.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import com.lmax.disruptor.EventFactory; import java.nio.ByteBuffer; import org.agrona.DirectBuffer; import org.agrona.concurrent.UnsafeBuffer; -import org.ldbcouncil.finbench.driver.runtime.metrics.sbe.MessageHeader; -import org.ldbcouncil.finbench.driver.runtime.metrics.sbe.MetricsEvent; +import org.graphybench.driver.driver.runtime.metrics.sbe.MessageHeader; +import org.graphybench.driver.driver.runtime.metrics.sbe.MetricsEvent; public class DisruptorSbeMetricsEvent { // Simple Binary Encoding related diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DisruptorSbeMetricsEventHandler.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/DisruptorSbeMetricsEventHandler.java similarity index 93% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DisruptorSbeMetricsEventHandler.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/DisruptorSbeMetricsEventHandler.java index dd32c596ffd862d0b037ac248907f0b5b4346e97..e77eefd4ff983783f3425887a72b8036094a9e45 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DisruptorSbeMetricsEventHandler.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/DisruptorSbeMetricsEventHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import static java.lang.String.format; @@ -23,11 +23,11 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicStampedReference; import org.agrona.concurrent.UnsafeBuffer; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.log.LoggingServiceFactory; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; -import org.ldbcouncil.finbench.driver.runtime.metrics.sbe.MetricsEvent; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.log.LoggingServiceFactory; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.metrics.sbe.MetricsEvent; +import org.graphybench.driver.driver.temporal.TimeSource; class DisruptorSbeMetricsEventHandler implements EventHandler { private final AtomicStampedReference statusSnapshotReference = diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DisruptorSbeMetricsService.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/DisruptorSbeMetricsService.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DisruptorSbeMetricsService.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/DisruptorSbeMetricsService.java index de4b08386c75ff16242dd39455f92ada3524a151..9f07330f35059e7f18f7767be5920eda69bfd0f1 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/DisruptorSbeMetricsService.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/DisruptorSbeMetricsService.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import static java.lang.String.format; -import static org.ldbcouncil.finbench.driver.runtime.metrics.DisruptorSbeMetricsEvent.GET_WORKLOAD_RESULTS; -import static org.ldbcouncil.finbench.driver.runtime.metrics.DisruptorSbeMetricsEvent.GET_WORKLOAD_STATUS; -import static org.ldbcouncil.finbench.driver.runtime.metrics.DisruptorSbeMetricsEvent.MESSAGE_HEADER_SIZE; -import static org.ldbcouncil.finbench.driver.runtime.metrics.DisruptorSbeMetricsEvent.SUBMIT_OPERATION_RESULT; +import static org.graphybench.driver.driver.runtime.metrics.DisruptorSbeMetricsEvent.GET_WORKLOAD_RESULTS; +import static org.graphybench.driver.driver.runtime.metrics.DisruptorSbeMetricsEvent.GET_WORKLOAD_STATUS; +import static org.graphybench.driver.driver.runtime.metrics.DisruptorSbeMetricsEvent.MESSAGE_HEADER_SIZE; +import static org.graphybench.driver.driver.runtime.metrics.DisruptorSbeMetricsEvent.SUBMIT_OPERATION_RESULT; import com.lmax.disruptor.BlockingWaitStrategy; import com.lmax.disruptor.EventTranslator; @@ -40,11 +40,11 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicStampedReference; import java.util.concurrent.locks.LockSupport; import org.agrona.concurrent.UnsafeBuffer; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.log.LoggingServiceFactory; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; -import org.ldbcouncil.finbench.driver.runtime.metrics.sbe.MetricsEvent; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.log.LoggingServiceFactory; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.metrics.sbe.MetricsEvent; +import org.graphybench.driver.driver.temporal.TimeSource; public class DisruptorSbeMetricsService implements MetricsService { private static final long SHUTDOWN_WAIT_TIMEOUT_AS_MILLI = TimeUnit.SECONDS.toMillis(5); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/JsonWorkloadMetricsFormatter.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/JsonWorkloadMetricsFormatter.java similarity index 86% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/JsonWorkloadMetricsFormatter.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/JsonWorkloadMetricsFormatter.java index be521967de4066b3ad82b48e7ca9b95cfc1e396b..5fee2efd02589cd5c5321cd860ae8c5f091c63d5 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/JsonWorkloadMetricsFormatter.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/JsonWorkloadMetricsFormatter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; -import org.ldbcouncil.finbench.driver.formatter.WorkloadMetricsFormatter; +import org.graphybench.driver.driver.formatter.WorkloadMetricsFormatter; public class JsonWorkloadMetricsFormatter implements WorkloadMetricsFormatter { @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/MetricsCollectionException.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/MetricsCollectionException.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/MetricsCollectionException.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/MetricsCollectionException.java index b812c69afc9eda8c570359a187890a3d9f2d1c95..69dfe029060088eccde99426292e08c429637d3b 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/MetricsCollectionException.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/MetricsCollectionException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; public class MetricsCollectionException extends Exception { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/MetricsManager.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/MetricsManager.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/MetricsManager.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/MetricsManager.java index 29e6b82ad502e0624957a4870c0a8e052512ba85..ab0caf4a625202652040ed745b141b12f5180436 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/MetricsManager.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/MetricsManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import static java.lang.String.format; import static java.util.stream.Collectors.toMap; @@ -25,10 +25,10 @@ import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.formatter.WorkloadMetricsFormatter; -import org.ldbcouncil.finbench.driver.log.LoggingServiceFactory; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.formatter.WorkloadMetricsFormatter; +import org.graphybench.driver.driver.log.LoggingServiceFactory; +import org.graphybench.driver.driver.temporal.TimeSource; public class MetricsManager { private final TimeSource timeSource; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/MetricsService.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/MetricsService.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/MetricsService.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/MetricsService.java index e161fedd6fb8988918515a5ef4bedeae2f799cc7..8cf737d50ee76bf6364f509e1df35b5058067b55 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/MetricsService.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/MetricsService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; public interface MetricsService { void shutdown() throws MetricsCollectionException; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/NullResultsLogWriter.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/NullResultsLogWriter.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/NullResultsLogWriter.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/NullResultsLogWriter.java index 77b919c4240d1dcae8b62175677aa175781a1ece..756e6a20fb22496d630a6d4cd9df82ceab56c437 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/NullResultsLogWriter.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/NullResultsLogWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import java.io.IOException; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/OperationMetricsSnapshot.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/OperationMetricsSnapshot.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/OperationMetricsSnapshot.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/OperationMetricsSnapshot.java index 628583881b45c3d8f878c476d7ab2dc9468f1f77..c7317651d6a7b36ec1ac69727c323670e978c999 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/OperationMetricsSnapshot.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/OperationMetricsSnapshot.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/OperationTypeMetricsManager.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/OperationTypeMetricsManager.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/OperationTypeMetricsManager.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/OperationTypeMetricsManager.java index 8fd97848786827603d29a6d0e6e2829b10627a81..65d3b4a4553418acb136eb92c442e86776d8a275 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/OperationTypeMetricsManager.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/OperationTypeMetricsManager.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import static java.lang.String.format; import java.util.Comparator; import java.util.concurrent.TimeUnit; -import org.ldbcouncil.finbench.driver.log.LoggingService; -import org.ldbcouncil.finbench.driver.log.LoggingServiceFactory; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.log.LoggingService; +import org.graphybench.driver.driver.log.LoggingServiceFactory; +import org.graphybench.driver.driver.temporal.TemporalUtil; public class OperationTypeMetricsManager { private static final String METRIC_RUNTIME = "Runtime"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/ResultsLogReader.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/ResultsLogReader.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/ResultsLogReader.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/ResultsLogReader.java index c2eab21d11b08e45e7006b1d41416c76757d4277..be095d5ee838b8f4f504cd9dd5108a8f1051747d 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/ResultsLogReader.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/ResultsLogReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/ResultsLogWriter.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/ResultsLogWriter.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/ResultsLogWriter.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/ResultsLogWriter.java index f6a3ec600a6f0a8b4c7274f84f73f33524c300ec..396d15394f21d0ffd72f2492b8abad95a79f961d 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/ResultsLogWriter.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/ResultsLogWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import java.io.IOException; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/WorkloadResultsSnapshot.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/WorkloadResultsSnapshot.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/WorkloadResultsSnapshot.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/WorkloadResultsSnapshot.java index 84348fb12006ae758369596cb4e2cd728d509962..51a2ed13e85618567e008a3bc426340d98955cba 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/WorkloadResultsSnapshot.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/WorkloadResultsSnapshot.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.concurrent.TimeUnit; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; public class WorkloadResultsSnapshot { @JsonProperty(value = "all_metrics") diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/WorkloadStatusSnapshot.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/WorkloadStatusSnapshot.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/WorkloadStatusSnapshot.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/WorkloadStatusSnapshot.java index 4f99362c0892b28b8b58ca99f71d16c0503af487..88e0d3643a21d790468a447e8ea0f7bee05b19c5 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/WorkloadStatusSnapshot.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/WorkloadStatusSnapshot.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; public class WorkloadStatusSnapshot { private final long runDurationAsMilli; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/sbe/MessageHeader.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/sbe/MessageHeader.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/sbe/MessageHeader.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/sbe/MessageHeader.java index 321ac7f196acddbb50bcc40faadead76d4fd7ca5..ac1991a9ee230cd72586e58f8adff1e2ae4f29d1 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/sbe/MessageHeader.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/sbe/MessageHeader.java @@ -16,7 +16,7 @@ /* Generated SBE (Simple Binary Encoding) message codec */ -package org.ldbcouncil.finbench.driver.runtime.metrics.sbe; +package org.graphybench.driver.driver.runtime.metrics.sbe; import org.agrona.concurrent.UnsafeBuffer; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/sbe/MetaAttribute.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/sbe/MetaAttribute.java similarity index 92% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/sbe/MetaAttribute.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/sbe/MetaAttribute.java index 5e1cbf16a8f3438ac8a1a58fe88ea08d8d497912..918bc8772b4496bc241cd48f895a364509d3bb62 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/sbe/MetaAttribute.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/sbe/MetaAttribute.java @@ -16,7 +16,7 @@ /* Generated SBE (Simple Binary Encoding) message codec */ -package org.ldbcouncil.finbench.driver.runtime.metrics.sbe; +package org.graphybench.driver.driver.runtime.metrics.sbe; public enum MetaAttribute { EPOCH, diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/sbe/MetricsEvent.java b/src/main/java/org/graphybench/driver/driver/runtime/metrics/sbe/MetricsEvent.java similarity index 99% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/sbe/MetricsEvent.java rename to src/main/java/org/graphybench/driver/driver/runtime/metrics/sbe/MetricsEvent.java index 479a18c02113491ab41b1aa2e05c006de721624f..f4d8366f47d29076a13e86558762e46dbdb26cc9 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/metrics/sbe/MetricsEvent.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/metrics/sbe/MetricsEvent.java @@ -16,7 +16,7 @@ /* Generated SBE (Simple Binary Encoding) message codec */ -package org.ldbcouncil.finbench.driver.runtime.metrics.sbe; +package org.graphybench.driver.driver.runtime.metrics.sbe; import org.agrona.concurrent.UnsafeBuffer; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/scheduling/CtDependencyCheck.java b/src/main/java/org/graphybench/driver/driver/runtime/scheduling/CtDependencyCheck.java similarity index 87% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/scheduling/CtDependencyCheck.java rename to src/main/java/org/graphybench/driver/driver/runtime/scheduling/CtDependencyCheck.java index 36f123d735527839b5dc4a9c9d4d7695180f45a6..3313ef2da4c2fea54e36d2f3bc2923be2a5bcaa6 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/scheduling/CtDependencyCheck.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/scheduling/CtDependencyCheck.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.scheduling; +package org.graphybench.driver.driver.runtime.scheduling; import static java.lang.String.format; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeException; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeReader; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeException; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeReader; +import org.graphybench.driver.driver.temporal.TemporalUtil; public class CtDependencyCheck implements SpinnerCheck { private static final TemporalUtil TEMPORAL_UTIL = new TemporalUtil(); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/scheduling/Spinner.java b/src/main/java/org/graphybench/driver/driver/runtime/scheduling/Spinner.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/scheduling/Spinner.java rename to src/main/java/org/graphybench/driver/driver/runtime/scheduling/Spinner.java index edbe4c64b31493550a8c36183f8bfea521628a3f..2fafe40490a96adb6490931f6f4f870925b8316a 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/scheduling/Spinner.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/scheduling/Spinner.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.scheduling; +package org.graphybench.driver.driver.runtime.scheduling; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; -import org.ldbcouncil.finbench.driver.util.Function2; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.temporal.TimeSource; +import org.graphybench.driver.driver.util.Function2; // TODO if error policy DOES NOT terminate benchmark and DOES NOT allow the operation to complete something needs // TODO to be done about DEPENDENT/CT, because the IT for the operation has already been reported diff --git a/src/main/java/org/ldbcouncil/finbench/driver/runtime/scheduling/SpinnerCheck.java b/src/main/java/org/graphybench/driver/driver/runtime/scheduling/SpinnerCheck.java similarity index 91% rename from src/main/java/org/ldbcouncil/finbench/driver/runtime/scheduling/SpinnerCheck.java rename to src/main/java/org/graphybench/driver/driver/runtime/scheduling/SpinnerCheck.java index 536762c5250068214f9a34b518f453531890ada1..593de46aeb1a421c8a2489e02b8cfea772ee8244 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/runtime/scheduling/SpinnerCheck.java +++ b/src/main/java/org/graphybench/driver/driver/runtime/scheduling/SpinnerCheck.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.scheduling; +package org.graphybench.driver.driver.runtime.scheduling; -import org.ldbcouncil.finbench.driver.Operation; +import org.graphybench.driver.driver.Operation; public interface SpinnerCheck { enum SpinnerCheckResult { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/statistics/WorkloadStatistics.java b/src/main/java/org/graphybench/driver/driver/statistics/WorkloadStatistics.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/statistics/WorkloadStatistics.java rename to src/main/java/org/graphybench/driver/driver/statistics/WorkloadStatistics.java index 4ce95fb196f19d1af3005cb483c8294f0f000b9c..fb39a3c80fbf6d05bba18dcc4560cfc775734616 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/statistics/WorkloadStatistics.java +++ b/src/main/java/org/graphybench/driver/driver/statistics/WorkloadStatistics.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.statistics; +package org.graphybench.driver.driver.statistics; import static java.lang.String.format; @@ -26,13 +26,13 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.runtime.metrics.ContinuousMetricManager; -import org.ldbcouncil.finbench.driver.runtime.metrics.ContinuousMetricSnapshot; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; -import org.ldbcouncil.finbench.driver.util.Bucket; -import org.ldbcouncil.finbench.driver.util.Histogram; -import org.ldbcouncil.finbench.driver.util.MapUtils; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.runtime.metrics.ContinuousMetricManager; +import org.graphybench.driver.driver.runtime.metrics.ContinuousMetricSnapshot; +import org.graphybench.driver.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.util.Bucket; +import org.graphybench.driver.driver.util.Histogram; +import org.graphybench.driver.driver.util.MapUtils; public class WorkloadStatistics { private final Map firstStartTimesAsMilliByOperationType; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/statistics/WorkloadStatisticsCalculator.java b/src/main/java/org/graphybench/driver/driver/statistics/WorkloadStatisticsCalculator.java similarity index 92% rename from src/main/java/org/ldbcouncil/finbench/driver/statistics/WorkloadStatisticsCalculator.java rename to src/main/java/org/graphybench/driver/driver/statistics/WorkloadStatisticsCalculator.java index 5d9929f05384174a6b793f303c408a888958b848..d4360b88696ed8e0932b4450907f0f321ed61f28 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/statistics/WorkloadStatisticsCalculator.java +++ b/src/main/java/org/graphybench/driver/driver/statistics/WorkloadStatisticsCalculator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.statistics; +package org.graphybench.driver.driver.statistics; import java.util.ArrayList; import java.util.HashMap; @@ -23,16 +23,16 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import org.ldbcouncil.finbench.driver.ChildOperationGenerator; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.WorkloadStreams; -import org.ldbcouncil.finbench.driver.generator.GeneratorFactory; -import org.ldbcouncil.finbench.driver.generator.RandomDataGeneratorFactory; -import org.ldbcouncil.finbench.driver.runtime.metrics.ContinuousMetricManager; -import org.ldbcouncil.finbench.driver.runtime.metrics.MetricsCollectionException; -import org.ldbcouncil.finbench.driver.util.Bucket; -import org.ldbcouncil.finbench.driver.util.Histogram; +import org.graphybench.driver.driver.ChildOperationGenerator; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.WorkloadStreams; +import org.graphybench.driver.driver.generator.GeneratorFactory; +import org.graphybench.driver.driver.generator.RandomDataGeneratorFactory; +import org.graphybench.driver.driver.runtime.metrics.ContinuousMetricManager; +import org.graphybench.driver.driver.runtime.metrics.MetricsCollectionException; +import org.graphybench.driver.driver.util.Bucket; +import org.graphybench.driver.driver.util.Histogram; public class WorkloadStatisticsCalculator { /** diff --git a/src/main/java/org/ldbcouncil/finbench/driver/temporal/ManualTimeSource.java b/src/main/java/org/graphybench/driver/driver/temporal/ManualTimeSource.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/temporal/ManualTimeSource.java rename to src/main/java/org/graphybench/driver/driver/temporal/ManualTimeSource.java index 72e3abc91b6275f8cba02c4141ffce115e320422..24e3e01715b1978c978cfc1ff16e658f2532b710 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/temporal/ManualTimeSource.java +++ b/src/main/java/org/graphybench/driver/driver/temporal/ManualTimeSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.temporal; +package org.graphybench.driver.driver.temporal; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/temporal/SystemTimeSource.java b/src/main/java/org/graphybench/driver/driver/temporal/SystemTimeSource.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/temporal/SystemTimeSource.java rename to src/main/java/org/graphybench/driver/driver/temporal/SystemTimeSource.java index 015fa2a3c3673be79bf01000ef09a9579223274e..c5babdd05191f4d2dcd433f433b30a6a06445c8c 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/temporal/SystemTimeSource.java +++ b/src/main/java/org/graphybench/driver/driver/temporal/SystemTimeSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.temporal; +package org.graphybench.driver.driver.temporal; public class SystemTimeSource implements TimeSource { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/temporal/TemporalException.java b/src/main/java/org/graphybench/driver/driver/temporal/TemporalException.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/temporal/TemporalException.java rename to src/main/java/org/graphybench/driver/driver/temporal/TemporalException.java index feded8b13fca37c27d703dc8595ea220bb54a0c0..917d3b28b16928bbec4919f7068e5abd53c9d32e 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/temporal/TemporalException.java +++ b/src/main/java/org/graphybench/driver/driver/temporal/TemporalException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.temporal; +package org.graphybench.driver.driver.temporal; public class TemporalException extends RuntimeException { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/temporal/TemporalUtil.java b/src/main/java/org/graphybench/driver/driver/temporal/TemporalUtil.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/temporal/TemporalUtil.java rename to src/main/java/org/graphybench/driver/driver/temporal/TemporalUtil.java index 7de6f9f3d4af8c3e528d0f2ac81b0a85df679734..bc5e691ef0135ef26e02676a60e306f1518f38e6 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/temporal/TemporalUtil.java +++ b/src/main/java/org/graphybench/driver/driver/temporal/TemporalUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.temporal; +package org.graphybench.driver.driver.temporal; import static java.lang.String.format; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/temporal/TimeSource.java b/src/main/java/org/graphybench/driver/driver/temporal/TimeSource.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/temporal/TimeSource.java rename to src/main/java/org/graphybench/driver/driver/temporal/TimeSource.java index abb30c9e39a4cfc248472d7b20f2165fb859ca33..e6718dda0aea043a4542ed3e82521f6acdfc211a 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/temporal/TimeSource.java +++ b/src/main/java/org/graphybench/driver/driver/temporal/TimeSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.temporal; +package org.graphybench.driver.driver.temporal; public interface TimeSource { // Avoid object creation where possible diff --git a/src/main/java/org/ldbcouncil/finbench/driver/truncation/TruncationOrder.java b/src/main/java/org/graphybench/driver/driver/truncation/TruncationOrder.java similarity index 93% rename from src/main/java/org/ldbcouncil/finbench/driver/truncation/TruncationOrder.java rename to src/main/java/org/graphybench/driver/driver/truncation/TruncationOrder.java index 6932b494ffef674f8afb652eacd44dedac082ba2..c6f2ef0a6ca4eb808bb5985bf7f9a09a89e34c64 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/truncation/TruncationOrder.java +++ b/src/main/java/org/graphybench/driver/driver/truncation/TruncationOrder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.truncation; +package org.graphybench.driver.driver.truncation; public enum TruncationOrder { TIMESTAMP_DESCENDING, diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/Bucket.java b/src/main/java/org/graphybench/driver/driver/util/Bucket.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/util/Bucket.java rename to src/main/java/org/graphybench/driver/driver/util/Bucket.java index 51e3d97de274f646ac39975dcae858bf08fe009e..afd5b05c0e1dc187c6cff5f207a718b44996dcee 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/Bucket.java +++ b/src/main/java/org/graphybench/driver/driver/util/Bucket.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; import com.google.common.collect.Range; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/ClassLoaderHelper.java b/src/main/java/org/graphybench/driver/driver/util/ClassLoaderHelper.java similarity index 90% rename from src/main/java/org/ldbcouncil/finbench/driver/util/ClassLoaderHelper.java rename to src/main/java/org/graphybench/driver/driver/util/ClassLoaderHelper.java index 06df2f4ad4ec79b73d9817a4d38d4bf34b451286..20dc0d89267ee58262377698bae4315d233062ce 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/ClassLoaderHelper.java +++ b/src/main/java/org/graphybench/driver/driver/util/ClassLoaderHelper.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; import static java.lang.String.format; -import org.ldbcouncil.finbench.driver.Db; -import org.ldbcouncil.finbench.driver.DbException; -import org.ldbcouncil.finbench.driver.OperationException; -import org.ldbcouncil.finbench.driver.OperationHandler; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.WorkloadException; +import org.graphybench.driver.driver.Db; +import org.graphybench.driver.driver.DbException; +import org.graphybench.driver.driver.OperationException; +import org.graphybench.driver.driver.OperationHandler; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.WorkloadException; public class ClassLoaderHelper { /** diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/ClassLoadingException.java b/src/main/java/org/graphybench/driver/driver/util/ClassLoadingException.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/util/ClassLoadingException.java rename to src/main/java/org/graphybench/driver/driver/util/ClassLoadingException.java index 19a60911e812597552558c049b2489759120582d..a01cf428210a7c474deee31d30d0adc7e6f6c5cf 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/ClassLoadingException.java +++ b/src/main/java/org/graphybench/driver/driver/util/ClassLoadingException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; public class ClassLoadingException extends Exception { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/DbException.java b/src/main/java/org/graphybench/driver/driver/util/DbException.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/util/DbException.java rename to src/main/java/org/graphybench/driver/driver/util/DbException.java index 2d7d9a2522932906e93bf8708553ebb84b91b238..24f92a3ac5d962a7114f5b85eb07810467c644e3 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/DbException.java +++ b/src/main/java/org/graphybench/driver/driver/util/DbException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; public class DbException extends Exception { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/FileUtils.java b/src/main/java/org/graphybench/driver/driver/util/FileUtils.java similarity index 99% rename from src/main/java/org/ldbcouncil/finbench/driver/util/FileUtils.java rename to src/main/java/org/graphybench/driver/driver/util/FileUtils.java index def8503a2241358d85f9a8e438ecbcd9736dd70a..e81325e34e4df4ee05e6cfa5dfc127a302f8060d 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/FileUtils.java +++ b/src/main/java/org/graphybench/driver/driver/util/FileUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/Function0.java b/src/main/java/org/graphybench/driver/driver/util/Function0.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/util/Function0.java rename to src/main/java/org/graphybench/driver/driver/util/Function0.java index fecdc261e62f8dc37d14d87694058f406c3aee40..43b161143e4178aba1b7e186345e3879d0134b6c 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/Function0.java +++ b/src/main/java/org/graphybench/driver/driver/util/Function0.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; public interface Function0 { RETURN apply() throws EXCEPTION; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/Function1.java b/src/main/java/org/graphybench/driver/driver/util/Function1.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/util/Function1.java rename to src/main/java/org/graphybench/driver/driver/util/Function1.java index 88e83c78443180c46482710d48fb0b3640e8c171..abde3d653a127c52edf8d50fd7b188a63945b6f2 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/Function1.java +++ b/src/main/java/org/graphybench/driver/driver/util/Function1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; public interface Function1 { RETURN apply(INPUT input) throws EXCEPTION; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/Function2.java b/src/main/java/org/graphybench/driver/driver/util/Function2.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/util/Function2.java rename to src/main/java/org/graphybench/driver/driver/util/Function2.java index 87e784998da53520d336e2335cc062f1d46c9058..52aaec255f8c1d559ba4133e11e9cf68ab164652 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/Function2.java +++ b/src/main/java/org/graphybench/driver/driver/util/Function2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; public interface Function2 { RETURN apply(INPUT1 input1, INPUT2 input2) throws EXCEPTION; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/Histogram.java b/src/main/java/org/graphybench/driver/driver/util/Histogram.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/util/Histogram.java rename to src/main/java/org/graphybench/driver/driver/util/Histogram.java index f84785cf10c9759fd3bc760e0e63550a2492a453..2a058824bfd4db7046a15422419d7eb29d0b3b59 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/Histogram.java +++ b/src/main/java/org/graphybench/driver/driver/util/Histogram.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; import static java.lang.String.format; @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.TreeMap; -import org.ldbcouncil.finbench.driver.util.Bucket.NumberRangeBucket; +import org.graphybench.driver.driver.util.Bucket.NumberRangeBucket; // THING_TYPE - Things - type of things being counted // ---> Bucket must be able to compare this diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/ListUtils.java b/src/main/java/org/graphybench/driver/driver/util/ListUtils.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/util/ListUtils.java rename to src/main/java/org/graphybench/driver/driver/util/ListUtils.java index e8ef368949cbe12bdd1fd874fe979466564c21ce..96e7df932b406a146df7c22dbc846364259b93a8 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/ListUtils.java +++ b/src/main/java/org/graphybench/driver/driver/util/ListUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; import com.google.common.collect.Lists; import java.util.HashSet; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/MapUtils.java b/src/main/java/org/graphybench/driver/driver/util/MapUtils.java similarity index 99% rename from src/main/java/org/ldbcouncil/finbench/driver/util/MapUtils.java rename to src/main/java/org/graphybench/driver/driver/util/MapUtils.java index 85c5b29d5cc9d1e9d97d86e1e366c74423571b7e..061ec18be4192993aba5bd9afc79b3133b7e5521 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/MapUtils.java +++ b/src/main/java/org/graphybench/driver/driver/util/MapUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; import com.google.common.collect.Lists; import java.io.ByteArrayInputStream; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/NumberHelper.java b/src/main/java/org/graphybench/driver/driver/util/NumberHelper.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/util/NumberHelper.java rename to src/main/java/org/graphybench/driver/driver/util/NumberHelper.java index be11ebc6a440044ae81dc1c279f3ff82e78cab13..e928ea32e34c6e74259606aee5b69c58d13b4e8a 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/NumberHelper.java +++ b/src/main/java/org/graphybench/driver/driver/util/NumberHelper.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; import static java.lang.String.format; import org.apache.commons.math3.distribution.ExponentialDistribution; import org.apache.commons.math3.random.RandomDataGenerator; -import org.ldbcouncil.finbench.driver.generator.GeneratorException; +import org.graphybench.driver.driver.generator.GeneratorException; public abstract class NumberHelper { private static final NumberHelper integerNumberHelper = new IntegerNumberHelper(); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/Tuple.java b/src/main/java/org/graphybench/driver/driver/util/Tuple.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/util/Tuple.java rename to src/main/java/org/graphybench/driver/driver/util/Tuple.java index 76d210f05379bdda4fee4a3cee7f4d48b383604c..1b6f7b1978dccd12db5139b8fc6844fccfc2cab9 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/Tuple.java +++ b/src/main/java/org/graphybench/driver/driver/util/Tuple.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; public class Tuple { public static Tuple2 tuple2(Type1 t1, Type2 t2) { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/Tuple2.java b/src/main/java/org/graphybench/driver/driver/util/Tuple2.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/util/Tuple2.java rename to src/main/java/org/graphybench/driver/driver/util/Tuple2.java index a96c5561e5b18974d35d437c3143f5abe5aaae1f..32788235159ade9f2e488736cbc79c9164c7a084 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/Tuple2.java +++ b/src/main/java/org/graphybench/driver/driver/util/Tuple2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; public class Tuple2 { private final T1 thing1; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/Tuple3.java b/src/main/java/org/graphybench/driver/driver/util/Tuple3.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/util/Tuple3.java rename to src/main/java/org/graphybench/driver/driver/util/Tuple3.java index 6e4396fb0cecc7df88e5e6c33cc0424cbe6b751e..42973d9115d164ab414f7f2d18f96af49f0dae17 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/Tuple3.java +++ b/src/main/java/org/graphybench/driver/driver/util/Tuple3.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; public class Tuple3 { private final T1 thing1; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/util/Tuple4.java b/src/main/java/org/graphybench/driver/driver/util/Tuple4.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/util/Tuple4.java rename to src/main/java/org/graphybench/driver/driver/util/Tuple4.java index 6bed04a663d450c975c8c5bc6721cd0db735e40f..82245631aeb0650beb7f104d12b2947c96cc1db3 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/util/Tuple4.java +++ b/src/main/java/org/graphybench/driver/driver/util/Tuple4.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.util; +package org.graphybench.driver.driver.util; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/DbValidationResult.java b/src/main/java/org/graphybench/driver/driver/validation/DbValidationResult.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/DbValidationResult.java rename to src/main/java/org/graphybench/driver/driver/validation/DbValidationResult.java index 9b733bdd03cf3914a3bf27752c512a2f839f60ce..1ff2cecd5ac449056ed1271de127986c30b719c0 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/DbValidationResult.java +++ b/src/main/java/org/graphybench/driver/driver/validation/DbValidationResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; import static java.lang.String.format; @@ -32,14 +32,14 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import org.ldbcouncil.finbench.driver.Db; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.util.MapUtils; -import org.ldbcouncil.finbench.driver.util.Tuple; -import org.ldbcouncil.finbench.driver.util.Tuple2; -import org.ldbcouncil.finbench.driver.util.Tuple3; +import org.graphybench.driver.driver.Db; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.util.MapUtils; +import org.graphybench.driver.driver.util.Tuple; +import org.graphybench.driver.driver.util.Tuple2; +import org.graphybench.driver.driver.util.Tuple3; public class DbValidationResult { private static final TypeReference>> TYPE_REFERENCE = diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/DbValidator.java b/src/main/java/org/graphybench/driver/driver/validation/DbValidator.java similarity index 86% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/DbValidator.java rename to src/main/java/org/graphybench/driver/driver/validation/DbValidator.java index 43a6734c8e1b1eb2f6c35b5b59db74ea317927d1..472968fac08f4714a4c7f23cd6fe36fd90bae08a 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/DbValidator.java +++ b/src/main/java/org/graphybench/driver/driver/validation/DbValidator.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; import static java.lang.String.format; import java.text.DecimalFormat; import java.util.Iterator; import java.util.Set; -import org.ldbcouncil.finbench.driver.Db; -import org.ldbcouncil.finbench.driver.DbConnectionState; -import org.ldbcouncil.finbench.driver.DbException; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.OperationHandler; -import org.ldbcouncil.finbench.driver.OperationHandlerRunnableContext; -import org.ldbcouncil.finbench.driver.ResultReporter; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.Db; +import org.graphybench.driver.driver.DbConnectionState; +import org.graphybench.driver.driver.DbException; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.OperationHandler; +import org.graphybench.driver.driver.OperationHandlerRunnableContext; +import org.graphybench.driver.driver.ResultReporter; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; public class DbValidator { /** @@ -39,8 +39,7 @@ public class DbValidator { * @param validationParameters Iterator of validation parameters created using 'create_validation' mode * @param db The database connector * @param validationParamsCount Total validation parameters - * @param workload The workload to use, e.g. @see org.ldbcouncil.finbench.driver.workloads - * .interactive.LdbcSnbInteractiveWorkload + * @param workload The workload to use. * @return DbValidationResult * @throws WorkloadException */ diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/ResultsLogValidationResult.java b/src/main/java/org/graphybench/driver/driver/validation/ResultsLogValidationResult.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/ResultsLogValidationResult.java rename to src/main/java/org/graphybench/driver/driver/validation/ResultsLogValidationResult.java index e27aa01c06b95d33b142e6e01f12200b14204548..624a727b821c78ece07a6ea7675a6c185a930962 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/ResultsLogValidationResult.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ResultsLogValidationResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/ResultsLogValidationSummary.java b/src/main/java/org/graphybench/driver/driver/validation/ResultsLogValidationSummary.java similarity index 99% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/ResultsLogValidationSummary.java rename to src/main/java/org/graphybench/driver/driver/validation/ResultsLogValidationSummary.java index 7d80654659b402963029de66a067ecb4a2e82c74..81aaa971e9ee1d7956a2cdc422883eb5e53c950a 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/ResultsLogValidationSummary.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ResultsLogValidationSummary.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/ResultsLogValidationSummaryCalculator.java b/src/main/java/org/graphybench/driver/driver/validation/ResultsLogValidationSummaryCalculator.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/ResultsLogValidationSummaryCalculator.java rename to src/main/java/org/graphybench/driver/driver/validation/ResultsLogValidationSummaryCalculator.java index e933c761bb5aab47530caad1f67d363a96b6dd3d..7f6ad5e1b6240afa6ff1d982f3f6cc35dac1b599 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/ResultsLogValidationSummaryCalculator.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ResultsLogValidationSummaryCalculator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/ResultsLogValidationTolerances.java b/src/main/java/org/graphybench/driver/driver/validation/ResultsLogValidationTolerances.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/ResultsLogValidationTolerances.java rename to src/main/java/org/graphybench/driver/driver/validation/ResultsLogValidationTolerances.java index 80a09efa407a14ecdb00fd5c1853a86753901b69..ca3e09b8cde686ff4d0f4bc5f88e5358677ed751 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/ResultsLogValidationTolerances.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ResultsLogValidationTolerances.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; /** * ResultsLogValidationTolerances.java diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/ResultsLogValidator.java b/src/main/java/org/graphybench/driver/driver/validation/ResultsLogValidator.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/ResultsLogValidator.java rename to src/main/java/org/graphybench/driver/driver/validation/ResultsLogValidator.java index ecfbcdd9aab9c88c9a9621f6fb6b4637a20a72ec..8c2772425e1545bc17f556f8caff28dff2d9ee27 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/ResultsLogValidator.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ResultsLogValidator.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; import static java.lang.String.format; -import static org.ldbcouncil.finbench.driver.validation.ResultsLogValidationResult.ValidationErrorType; +import static org.graphybench.driver.driver.validation.ResultsLogValidationResult.ValidationErrorType; import java.io.File; import java.io.FileNotFoundException; import java.util.HashMap; import java.util.Map; -import org.ldbcouncil.finbench.driver.csv.simple.SimpleCsvFileReader; -import org.ldbcouncil.finbench.driver.runtime.metrics.OperationMetricsSnapshot; -import org.ldbcouncil.finbench.driver.runtime.metrics.WorkloadResultsSnapshot; -import org.ldbcouncil.finbench.driver.temporal.TemporalUtil; +import org.graphybench.driver.driver.csv.simple.SimpleCsvFileReader; +import org.graphybench.driver.driver.runtime.metrics.OperationMetricsSnapshot; +import org.graphybench.driver.driver.runtime.metrics.WorkloadResultsSnapshot; +import org.graphybench.driver.driver.temporal.TemporalUtil; /** * ResultsLogValidator.java diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationEquality.java b/src/main/java/org/graphybench/driver/driver/validation/ValidationEquality.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationEquality.java rename to src/main/java/org/graphybench/driver/driver/validation/ValidationEquality.java index 53adb12e8080c8bf7fe7c3c946f709eb43877fe8..8b55792af419278044da6258b59af76e423d12d5 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationEquality.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ValidationEquality.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; import java.math.RoundingMode; import java.text.DecimalFormat; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationException.java b/src/main/java/org/graphybench/driver/driver/validation/ValidationException.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationException.java rename to src/main/java/org/graphybench/driver/driver/validation/ValidationException.java index 70fdc552414e775b0fbd7ebf55432720702760a6..766e0ac0e5f2632c8c429af2915d9ba2e6d1d58c 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationException.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ValidationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; public class ValidationException extends Exception { public ValidationException(String message) { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParam.java b/src/main/java/org/graphybench/driver/driver/validation/ValidationParam.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParam.java rename to src/main/java/org/graphybench/driver/driver/validation/ValidationParam.java index 69035d7fe44ab82c53f8418986c0524b0f152a3b..2c7269cc6fa3506cab76c174ed385df4740034fe 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParam.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ValidationParam.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.Objects; -import org.ldbcouncil.finbench.driver.Operation; +import org.graphybench.driver.driver.Operation; @JsonSerialize(using = ValidationParamSerializer.class) @JsonDeserialize(using = ValidationParamDeserializer.class) diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamDeserializer.java b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamDeserializer.java similarity index 84% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamDeserializer.java rename to src/main/java/org/graphybench/driver/driver/validation/ValidationParamDeserializer.java index 87887b5f44c601b819bd63ddc96e899cad1d4ee2..335d4a66c2492aa9d10929a404adbef7a6728c73 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamDeserializer.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamDeserializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -23,8 +23,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import java.io.IOException; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; public class ValidationParamDeserializer extends StdDeserializer { @@ -44,8 +44,8 @@ public class ValidationParamDeserializer extends StdDeserializer { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamsFromCsvRows.java b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamsFromCsvRows.java similarity index 91% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamsFromCsvRows.java rename to src/main/java/org/graphybench/driver/driver/validation/ValidationParamsFromCsvRows.java index 976015812cf2a7ac838347872072ee752e557e3f..bbd57f58a108a54322f9467bd11c3561f218bb2b 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamsFromCsvRows.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamsFromCsvRows.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; import static java.lang.String.format; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.generator.GeneratorException; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.generator.GeneratorException; public class ValidationParamsFromCsvRows implements Iterator { private final Iterator csvRows; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamsFromJson.java b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamsFromJson.java similarity index 93% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamsFromJson.java rename to src/main/java/org/graphybench/driver/driver/validation/ValidationParamsFromJson.java index db88091e79fc11020e7fa628355bc80d9755ad2b..ccd9e05fb1821ca7f5583958a0e20dad5cada62d 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamsFromJson.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamsFromJson.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.List; -import org.ldbcouncil.finbench.driver.Workload; +import org.graphybench.driver.driver.Workload; public class ValidationParamsFromJson { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamsGenerator.java b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamsGenerator.java similarity index 87% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamsGenerator.java rename to src/main/java/org/graphybench/driver/driver/validation/ValidationParamsGenerator.java index 28b9a7a6419f95930458549a574498e4e7abd879..f22fd05af3a82761410fc530d90a3cc84b99a904 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamsGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamsGenerator.java @@ -14,26 +14,26 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; import static java.lang.String.format; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.ldbcouncil.finbench.driver.Db; -import org.ldbcouncil.finbench.driver.DbConnectionState; -import org.ldbcouncil.finbench.driver.DbException; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.OperationHandler; -import org.ldbcouncil.finbench.driver.OperationHandlerRunnableContext; -import org.ldbcouncil.finbench.driver.ResultReporter; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.Workload.DbValidationParametersFilter; -import org.ldbcouncil.finbench.driver.Workload.DbValidationParametersFilterResult; -import org.ldbcouncil.finbench.driver.generator.Generator; -import org.ldbcouncil.finbench.driver.generator.GeneratorException; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.Db; +import org.graphybench.driver.driver.DbConnectionState; +import org.graphybench.driver.driver.DbException; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.OperationHandler; +import org.graphybench.driver.driver.OperationHandlerRunnableContext; +import org.graphybench.driver.driver.ResultReporter; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.Workload.DbValidationParametersFilter; +import org.graphybench.driver.driver.Workload.DbValidationParametersFilterResult; +import org.graphybench.driver.driver.generator.Generator; +import org.graphybench.driver.driver.generator.GeneratorException; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; /** * Class generating validation parameters for specified workload. diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamsToCsvRows.java b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamsToCsvRows.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamsToCsvRows.java rename to src/main/java/org/graphybench/driver/driver/validation/ValidationParamsToCsvRows.java index e6266bf213df928d1ba28bbe218a526e06f82f7a..965a0db58952c6070b081800de15ea648e338ae2 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamsToCsvRows.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamsToCsvRows.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; import static java.lang.String.format; @@ -22,9 +22,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.generator.GeneratorException; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.generator.GeneratorException; public class ValidationParamsToCsvRows implements Iterator { private final Iterator validationParams; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamsToJson.java b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamsToJson.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamsToJson.java rename to src/main/java/org/graphybench/driver/driver/validation/ValidationParamsToJson.java index 2eaf484c1f28d4159bb6d71d9fbe3279144814d6..f1fe23e94f1eb483991fa1b897cba43defdc5708 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamsToJson.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamsToJson.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; import static java.lang.String.format; @@ -23,8 +23,8 @@ import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.List; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.generator.GeneratorException; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.generator.GeneratorException; public class ValidationParamsToJson { private final List validationParams; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/ClassNameWorkloadFactory.java b/src/main/java/org/graphybench/driver/driver/workloads/ClassNameWorkloadFactory.java similarity index 84% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/ClassNameWorkloadFactory.java rename to src/main/java/org/graphybench/driver/driver/workloads/ClassNameWorkloadFactory.java index e64bdd74231c21a254bc00a7603fccc36fa852c2..72b6f3c6f4892496f6396e26f1f2eb6cf39ec8e4 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/ClassNameWorkloadFactory.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/ClassNameWorkloadFactory.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads; +package org.graphybench.driver.driver.workloads; import static java.lang.String.format; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.util.ClassLoaderHelper; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.util.ClassLoaderHelper; public class ClassNameWorkloadFactory implements WorkloadFactory { private final String workloadClassName; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/WorkloadFactory.java b/src/main/java/org/graphybench/driver/driver/workloads/WorkloadFactory.java similarity index 82% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/WorkloadFactory.java rename to src/main/java/org/graphybench/driver/driver/workloads/WorkloadFactory.java index 64594d09805c20b2283d9186b65aa570582aa190..4662b40568e512489d8cb88203e16f0a18c024c7 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/WorkloadFactory.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/WorkloadFactory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads; +package org.graphybench.driver.driver.workloads; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.WorkloadException; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.WorkloadException; public interface WorkloadFactory { Workload createWorkload() throws WorkloadException; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/simple/SimpleWorkload.java b/src/main/java/org/graphybench/driver/driver/workloads/simple/SimpleWorkload.java similarity index 81% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/simple/SimpleWorkload.java rename to src/main/java/org/graphybench/driver/driver/workloads/simple/SimpleWorkload.java index 979d025da07025681d0d545daa62c7400850674e..8bdc43e44fc6aa7521360586131a6733f9822b25 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/simple/SimpleWorkload.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/simple/SimpleWorkload.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.simple; +package org.graphybench.driver.driver.workloads.simple; import java.io.IOException; import java.util.Map; import java.util.Set; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.WorkloadStreams; -import org.ldbcouncil.finbench.driver.generator.GeneratorFactory; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.WorkloadStreams; +import org.graphybench.driver.driver.generator.GeneratorFactory; public class SimpleWorkload extends Workload { @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/simple/db/SimpleDb.java b/src/main/java/org/graphybench/driver/driver/workloads/simple/db/SimpleDb.java similarity index 91% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/simple/db/SimpleDb.java rename to src/main/java/org/graphybench/driver/driver/workloads/simple/db/SimpleDb.java index 518cc8354512d93fa474e1bac3a108e1ff74b96e..d3942445935d54856c7c38d0b979468960163b0c 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/simple/db/SimpleDb.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/simple/db/SimpleDb.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.simple.db; +package org.graphybench.driver.driver.workloads.simple.db; public class SimpleDb { } diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/BatchedOperationStreamReader.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/BatchedOperationStreamReader.java similarity index 84% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/BatchedOperationStreamReader.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/BatchedOperationStreamReader.java index b3303615ec7e3a7152734942a80287fbd6003b63..6f48142a8d1ae68be7224f843504bed7eede9af4 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/BatchedOperationStreamReader.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/BatchedOperationStreamReader.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import java.io.File; import java.sql.SQLException; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.csv.FileLoader; -import org.ldbcouncil.finbench.driver.generator.EventStreamReader; -import org.ldbcouncil.finbench.driver.util.Tuple2; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.csv.FileLoader; +import org.graphybench.driver.driver.generator.EventStreamReader; +import org.graphybench.driver.driver.util.Tuple2; public class BatchedOperationStreamReader { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcNoResult.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchNoResult.java similarity index 74% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcNoResult.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchNoResult.java index fd2ebc6a96c5ce6e72e80a5f85e9330399150e30..e2f14cac6a3522faac7c822a9ed79362e1842a85 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcNoResult.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchNoResult.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import com.fasterxml.jackson.databind.annotation.JsonSerialize; /* * This class defines the results from the insert operations (update queries) */ -@JsonSerialize(using = LdbcNoResultJsonSerializer.class) -public class LdbcNoResult { - public static final LdbcNoResult INSTANCE = new LdbcNoResult(); +@JsonSerialize(using = GraphyBenchNoResultJsonSerializer.class) +public class GraphyBenchNoResult { + public static final GraphyBenchNoResult INSTANCE = new GraphyBenchNoResult(); - private LdbcNoResult() { + private GraphyBenchNoResult() { } } diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcNoResultJsonSerializer.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchNoResultJsonSerializer.java similarity index 70% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcNoResultJsonSerializer.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchNoResultJsonSerializer.java index c9d515b2ad815794979736d94dad3dad84e6d336..166befe1e6e3cfcfd8aa80eef498513b1e7f7e80 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcNoResultJsonSerializer.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchNoResultJsonSerializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; @@ -22,21 +22,21 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; /* - * The LdbcNoResult is serialized to -1, which requires custom serialization. + * The NoResult is serialized to -1, which requires custom serialization. */ -public class LdbcNoResultJsonSerializer extends StdSerializer { +public class GraphyBenchNoResultJsonSerializer extends StdSerializer { - public LdbcNoResultJsonSerializer() { + public GraphyBenchNoResultJsonSerializer() { this(null); } - public LdbcNoResultJsonSerializer(Class t) { + public GraphyBenchNoResultJsonSerializer(Class t) { super(t); } @Override public void serialize(Object result, JsonGenerator generator, SerializerProvider provider) throws IOException { generator.writeString( - Integer.toString(LdbcFinBenchTransactionWorkloadConfiguration.WRITE_OPERATION_NO_RESULT_DEFAULT_RESULT)); + Integer.toString(GraphyBenchTransactionWorkloadConfiguration.WRITE_OPERATION_NO_RESULT_DEFAULT_RESULT)); } } diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcOperation.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchOperation.java similarity index 43% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcOperation.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchOperation.java index 96f576590f1e1caa8dfd0637f5fd26199958fa63..686fc8a6fcc2cfdd8529655b79b744a4b9b825be 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcOperation.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchOperation.java @@ -14,59 +14,58 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import static com.fasterxml.jackson.annotation.JsonTypeInfo.As; import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead10; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead11; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead12; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead7; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead8; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead9; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ReadWrite1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ReadWrite2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ReadWrite3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write10; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write11; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write12; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write13; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write14; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write15; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write16; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write17; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write18; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write19; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write7; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write8; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write9; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead1; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead10; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead11; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead12; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead2; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead3; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead4; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead5; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead6; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead7; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead8; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead9; +import org.graphybench.driver.driver.workloads.transaction.queries.ReadWrite1; +import org.graphybench.driver.driver.workloads.transaction.queries.ReadWrite2; +import org.graphybench.driver.driver.workloads.transaction.queries.ReadWrite3; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead1; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead2; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead3; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead4; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead5; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead6; +import org.graphybench.driver.driver.workloads.transaction.queries.Write1; +import org.graphybench.driver.driver.workloads.transaction.queries.Write10; +import org.graphybench.driver.driver.workloads.transaction.queries.Write11; +import org.graphybench.driver.driver.workloads.transaction.queries.Write12; +import org.graphybench.driver.driver.workloads.transaction.queries.Write13; +import org.graphybench.driver.driver.workloads.transaction.queries.Write14; +import org.graphybench.driver.driver.workloads.transaction.queries.Write15; +import org.graphybench.driver.driver.workloads.transaction.queries.Write16; +import org.graphybench.driver.driver.workloads.transaction.queries.Write17; +import org.graphybench.driver.driver.workloads.transaction.queries.Write18; +import org.graphybench.driver.driver.workloads.transaction.queries.Write19; +import org.graphybench.driver.driver.workloads.transaction.queries.Write2; +import org.graphybench.driver.driver.workloads.transaction.queries.Write3; +import org.graphybench.driver.driver.workloads.transaction.queries.Write4; +import org.graphybench.driver.driver.workloads.transaction.queries.Write5; +import org.graphybench.driver.driver.workloads.transaction.queries.Write6; +import org.graphybench.driver.driver.workloads.transaction.queries.Write7; +import org.graphybench.driver.driver.workloads.transaction.queries.Write8; +import org.graphybench.driver.driver.workloads.transaction.queries.Write9; /** - * LdbcOperation.java + * Operation.java * Wrapper abstract class to define the types of Operation classes the - * LDBC Finbench workload implements. + * Graphybench workload implements. */ @JsonTypeInfo(use = Id.NAME, include = As.WRAPPER_OBJECT) @@ -113,6 +112,6 @@ import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write9; @JsonSubTypes.Type(ReadWrite3.class) }) -public abstract class LdbcOperation extends Operation { +public abstract class GraphyBenchOperation extends org.graphybench.driver.driver.Operation { } diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchSimpleReadGenerator.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchSimpleReadGenerator.java similarity index 84% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchSimpleReadGenerator.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchSimpleReadGenerator.java index 1fa51d1911caf5ddc2f4746768cbad0ee725a527..c6113fb79fef353bbb2ce4882510e29e0a984960 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchSimpleReadGenerator.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchSimpleReadGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright © 2022 Linked Data Benchmark Council (info@ldbcouncil.org) + * Copyright © 2022 Linked Data Benchmark Council (info@ouncil.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import static java.lang.String.format; @@ -31,69 +31,69 @@ import java.util.Queue; import java.util.Set; import java.util.concurrent.TimeUnit; import org.apache.commons.math3.random.RandomDataGenerator; -import org.ldbcouncil.finbench.driver.ChildOperationGenerator; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.generator.RandomDataGeneratorFactory; -import org.ldbcouncil.finbench.driver.util.Tuple; -import org.ldbcouncil.finbench.driver.util.Tuple2; -import org.ldbcouncil.finbench.driver.util.Tuple4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead10; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead11; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead12; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead12Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead1Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead2Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead4Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead6Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead7; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead8; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead8Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead9; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ReadWrite1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ReadWrite2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ReadWrite3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead4Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead5Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead6Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write10; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write11; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write12; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write13; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write14; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write15; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write16; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write17; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write18; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write19; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write7; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write8; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write9; - -public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator { +import org.graphybench.driver.driver.ChildOperationGenerator; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.generator.RandomDataGeneratorFactory; +import org.graphybench.driver.driver.util.Tuple; +import org.graphybench.driver.driver.util.Tuple2; +import org.graphybench.driver.driver.util.Tuple4; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead1; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead10; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead11; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead12; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead12Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead1Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead2; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead2Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead3; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead4; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead4Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead5; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead6; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead6Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead7; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead8; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead8Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead9; +import org.graphybench.driver.driver.workloads.transaction.queries.ReadWrite1; +import org.graphybench.driver.driver.workloads.transaction.queries.ReadWrite2; +import org.graphybench.driver.driver.workloads.transaction.queries.ReadWrite3; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead1; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead2; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead3; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead4; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead4Result; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead5; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead5Result; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead6; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead6Result; +import org.graphybench.driver.driver.workloads.transaction.queries.Write1; +import org.graphybench.driver.driver.workloads.transaction.queries.Write10; +import org.graphybench.driver.driver.workloads.transaction.queries.Write11; +import org.graphybench.driver.driver.workloads.transaction.queries.Write12; +import org.graphybench.driver.driver.workloads.transaction.queries.Write13; +import org.graphybench.driver.driver.workloads.transaction.queries.Write14; +import org.graphybench.driver.driver.workloads.transaction.queries.Write15; +import org.graphybench.driver.driver.workloads.transaction.queries.Write16; +import org.graphybench.driver.driver.workloads.transaction.queries.Write17; +import org.graphybench.driver.driver.workloads.transaction.queries.Write18; +import org.graphybench.driver.driver.workloads.transaction.queries.Write19; +import org.graphybench.driver.driver.workloads.transaction.queries.Write2; +import org.graphybench.driver.driver.workloads.transaction.queries.Write3; +import org.graphybench.driver.driver.workloads.transaction.queries.Write4; +import org.graphybench.driver.driver.workloads.transaction.queries.Write5; +import org.graphybench.driver.driver.workloads.transaction.queries.Write6; +import org.graphybench.driver.driver.workloads.transaction.queries.Write7; +import org.graphybench.driver.driver.workloads.transaction.queries.Write8; +import org.graphybench.driver.driver.workloads.transaction.queries.Write9; + +public class GraphyBenchSimpleReadGenerator implements ChildOperationGenerator { public static final double THRESHOLD = 100; // The duration of the average random number. public static final long UNIFORMITY_DURATION = 1000L * 60 * 60 * 24 * 30; private final double initialProbability; - private final LdbcSimpleQueryFactory[] simpleQueryFactories; + private final SimpleQueryFactory[] simpleQueryFactories; private final double[] probabilityDegradationFactors; private final Queue> accountIdBuffer; private final Queue personIdBuffer; @@ -101,18 +101,18 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator private final long[] interleavesAsMilli; private final BufferReplenishFun bufferReplenishFun; - public LdbcFinBenchSimpleReadGenerator(double initialProbability, - double probabilityDegradationFactor, - long updateInterleaveAsMilli, - Set> enabledSimpleReadOperationTypes, - double compressionRatio, - Queue> accountIdBuffer, - Queue personIdBuffer, - Queue companyIdBuffer, - RandomDataGeneratorFactory randomFactory, - Map longReadInterleaves, - ScheduledStartTimePolicy scheduledStartTimePolicy, - BufferReplenishFun bufferReplenishFun) { + public GraphyBenchSimpleReadGenerator(double initialProbability, + double probabilityDegradationFactor, + long updateInterleaveAsMilli, + Set> enabledSimpleReadOperationTypes, + double compressionRatio, + Queue> accountIdBuffer, + Queue personIdBuffer, + Queue companyIdBuffer, + RandomDataGeneratorFactory randomFactory, + Map longReadInterleaves, + ScheduledStartTimePolicy scheduledStartTimePolicy, + BufferReplenishFun bufferReplenishFun) { this.initialProbability = initialProbability; this.accountIdBuffer = accountIdBuffer; this.personIdBuffer = personIdBuffer; @@ -141,7 +141,7 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator int maxOperationType = Ordering.natural().max(ComplexRead12.TYPE, SimpleRead6.TYPE, ReadWrite3.TYPE) + 1; - this.simpleQueryFactories = new LdbcSimpleQueryFactory[maxOperationType]; + this.simpleQueryFactories = new SimpleQueryFactory[maxOperationType]; this.probabilityDegradationFactors = new double[maxOperationType]; for (int i = 0; i < probabilityDegradationFactors.length; i++) { probabilityDegradationFactors[i] = 0; @@ -181,19 +181,19 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator S6_INDEX -> S6 S7_INDEX -> S7 */ - LdbcSimpleQueryFactory[] baseSimpleReadFactories = new LdbcSimpleQueryFactory[maxOperationType]; + SimpleQueryFactory[] baseSimpleReadFactories = new SimpleQueryFactory[maxOperationType]; baseSimpleReadFactories[SimpleRead1.TYPE] = - new LdbcSimpleQuery1Factory(scheduledStartTimePolicy); + new SimpleQuery1Factory(scheduledStartTimePolicy); baseSimpleReadFactories[SimpleRead2.TYPE] = - new LdbcSimpleQuery2Factory(scheduledStartTimePolicy); + new SimpleQuery2Factory(scheduledStartTimePolicy); baseSimpleReadFactories[SimpleRead3.TYPE] = - new LdbcSimpleQuery3Factory(scheduledStartTimePolicy); + new SimpleQuery3Factory(scheduledStartTimePolicy); baseSimpleReadFactories[SimpleRead4.TYPE] = - new LdbcSimpleQuery4Factory(scheduledStartTimePolicy); + new SimpleQuery4Factory(scheduledStartTimePolicy); baseSimpleReadFactories[SimpleRead5.TYPE] = - new LdbcSimpleQuery5Factory(scheduledStartTimePolicy); + new SimpleQuery5Factory(scheduledStartTimePolicy); baseSimpleReadFactories[SimpleRead6.TYPE] = - new LdbcSimpleQuery6Factory(scheduledStartTimePolicy); + new SimpleQuery6Factory(scheduledStartTimePolicy); /* FACTORIES @@ -232,26 +232,26 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator (FIRST_PERSON,FIRST_PERSON_INDEX) = ... (FIRST_MESSAGE,FIRST_MESSAGE_INDEX) = ... */ - Tuple2 firstAccountQueryAndIndex = + Tuple2 firstAccountQueryAndIndex = firstAccountQueryOrNoOp(enabledSimpleReadOperationTypes, randomFactory, 0, initialProbability, scheduledStartTimePolicy); - Tuple2 firstPersonQueryAndIndex = + Tuple2 firstPersonQueryAndIndex = firstPersonQueryOrNoOp(enabledSimpleReadOperationTypes, randomFactory, 0, initialProbability, scheduledStartTimePolicy); - Tuple2 firstCompanyQueryAndIndex = + Tuple2 firstCompanyQueryAndIndex = firstCompanyQueryOrNoOp(enabledSimpleReadOperationTypes, randomFactory, 0, initialProbability, scheduledStartTimePolicy); - LdbcSimpleQueryFactory firstAccountQuery = (Integer.MAX_VALUE == firstAccountQueryAndIndex._1()) + SimpleQueryFactory firstAccountQuery = (Integer.MAX_VALUE == firstAccountQueryAndIndex._1()) ? ((Integer.MAX_VALUE == firstPersonQueryAndIndex._1()) ? firstCompanyQueryAndIndex._2() : firstPersonQueryAndIndex._2()) : firstAccountQueryAndIndex._2(); - LdbcSimpleQueryFactory firstPersonQuery = (Integer.MAX_VALUE == firstPersonQueryAndIndex._1()) + SimpleQueryFactory firstPersonQuery = (Integer.MAX_VALUE == firstPersonQueryAndIndex._1()) ? ((Integer.MAX_VALUE == firstCompanyQueryAndIndex._1()) ? firstAccountQueryAndIndex._2() : firstCompanyQueryAndIndex._2()) : firstPersonQueryAndIndex._2(); - LdbcSimpleQueryFactory firstCompanyQuery = (Integer.MAX_VALUE == firstCompanyQueryAndIndex._1()) + SimpleQueryFactory firstCompanyQuery = (Integer.MAX_VALUE == firstCompanyQueryAndIndex._1()) ? ((Integer.MAX_VALUE == firstAccountQueryAndIndex._1()) ? firstPersonQueryAndIndex._2() : firstAccountQueryAndIndex._2()) : firstCompanyQueryAndIndex._2(); @@ -259,7 +259,7 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator /* RANDOM_FIRST = RANDOM(FIRST_PERSON,FIRST_MESSAGE) */ - LdbcSimpleQueryFactory randomFirstQuery = + SimpleQueryFactory randomFirstQuery = selectRandomFirstSimpleQuery(firstAccountQueryAndIndex, firstPersonQueryAndIndex, firstCompanyQueryAndIndex); @@ -558,98 +558,98 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator return Integer.MAX_VALUE; } - private Tuple2 firstAccountQueryOrNoOp( + private Tuple2 firstAccountQueryOrNoOp( Set> enabledSimpleReadOperationTypes, RandomDataGeneratorFactory randomFactory, double minProbability, double maxProbability, ScheduledStartTimePolicy scheduledStartTimePolicy) { if (enabledSimpleReadOperationTypes.contains(SimpleRead1.class)) { - return Tuple.tuple2( + return Tuple.tuple2( SimpleRead1.TYPE, new CoinTossingFactory(randomFactory.newRandom(), - new LdbcSimpleQuery1Factory(scheduledStartTimePolicy), minProbability, maxProbability) + new SimpleQuery1Factory(scheduledStartTimePolicy), minProbability, maxProbability) ); } else if (enabledSimpleReadOperationTypes.contains(SimpleRead2.class)) { - return Tuple.tuple2( + return Tuple.tuple2( SimpleRead2.TYPE, new CoinTossingFactory(randomFactory.newRandom(), - new LdbcSimpleQuery2Factory(scheduledStartTimePolicy), minProbability, maxProbability) + new SimpleQuery2Factory(scheduledStartTimePolicy), minProbability, maxProbability) ); } else if (enabledSimpleReadOperationTypes.contains(SimpleRead3.class)) { - return Tuple.tuple2( + return Tuple.tuple2( SimpleRead3.TYPE, new CoinTossingFactory(randomFactory.newRandom(), - new LdbcSimpleQuery3Factory(scheduledStartTimePolicy), minProbability, maxProbability) + new SimpleQuery3Factory(scheduledStartTimePolicy), minProbability, maxProbability) ); } else if (enabledSimpleReadOperationTypes.contains(SimpleRead4.class)) { - return Tuple.tuple2( + return Tuple.tuple2( SimpleRead4.TYPE, new CoinTossingFactory(randomFactory.newRandom(), - new LdbcSimpleQuery4Factory(scheduledStartTimePolicy), minProbability, maxProbability) + new SimpleQuery4Factory(scheduledStartTimePolicy), minProbability, maxProbability) ); } else if (enabledSimpleReadOperationTypes.contains(SimpleRead5.class)) { - return Tuple.tuple2( + return Tuple.tuple2( SimpleRead5.TYPE, new CoinTossingFactory(randomFactory.newRandom(), - new LdbcSimpleQuery5Factory(scheduledStartTimePolicy), minProbability, maxProbability) + new SimpleQuery5Factory(scheduledStartTimePolicy), minProbability, maxProbability) ); } else if (enabledSimpleReadOperationTypes.contains(SimpleRead6.class)) { - return Tuple.tuple2( + return Tuple.tuple2( SimpleRead6.TYPE, new CoinTossingFactory(randomFactory.newRandom(), - new LdbcSimpleQuery6Factory(scheduledStartTimePolicy), minProbability, maxProbability) + new SimpleQuery6Factory(scheduledStartTimePolicy), minProbability, maxProbability) ); } else { - return Tuple.tuple2( + return Tuple.tuple2( Integer.MAX_VALUE, new NoOpFactory() ); } } - private Tuple2 firstPersonQueryOrNoOp( + private Tuple2 firstPersonQueryOrNoOp( Set> enabledSimpleReadOperationTypes, RandomDataGeneratorFactory randomFactory, double minProbability, double maxProbability, ScheduledStartTimePolicy scheduledStartTimePolicy) { - return Tuple.tuple2( + return Tuple.tuple2( Integer.MAX_VALUE, new NoOpFactory() ); /*if (enabledSimpleReadOperationTypes.contains(SimpleRead7.class)) { - return Tuple.tuple2( + return Tuple.tuple2( SimpleRead7.TYPE, new CoinTossingFactory(randomFactory.newRandom(), - new LdbcSimpleQuery1Factory(scheduledStartTimePolicy), minProbability, maxProbability) + new SimpleQuery1Factory(scheduledStartTimePolicy), minProbability, maxProbability) ); } else { - return Tuple.tuple2( + return Tuple.tuple2( Integer.MAX_VALUE, new NoOpFactory() ); }*/ } - private Tuple2 firstCompanyQueryOrNoOp( + private Tuple2 firstCompanyQueryOrNoOp( Set> enabledSimpleReadOperationTypes, RandomDataGeneratorFactory randomFactory, double minProbability, double maxProbability, ScheduledStartTimePolicy scheduledStartTimePolicy) { - return Tuple.tuple2( + return Tuple.tuple2( Integer.MAX_VALUE, new NoOpFactory() ); /*if (enabledSimpleReadOperationTypes.contains(SimpleRead8.class)) { - return Tuple.tuple2( + return Tuple.tuple2( SimpleRead8.TYPE, new CoinTossingFactory(randomFactory.newRandom(), - new LdbcSimpleQuery1Factory(scheduledStartTimePolicy), minProbability, maxProbability) + new SimpleQuery1Factory(scheduledStartTimePolicy), minProbability, maxProbability) ); } else { - return Tuple.tuple2( + return Tuple.tuple2( Integer.MAX_VALUE, new NoOpFactory() ); @@ -692,10 +692,10 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator }*/ } - private LdbcSimpleQueryFactory selectRandomFirstSimpleQuery( - Tuple2 firstAccountQueryAndIndex, - Tuple2 firstPersonQueryAndIndex, - Tuple2 firstCompanyQueryAndIndex) { + private SimpleQueryFactory selectRandomFirstSimpleQuery( + Tuple2 firstAccountQueryAndIndex, + Tuple2 firstPersonQueryAndIndex, + Tuple2 firstCompanyQueryAndIndex) { if (!firstAccountQueryAndIndex._1().equals(Integer.MAX_VALUE)) { return firstAccountQueryAndIndex._2(); } else if (!firstPersonQueryAndIndex._1().equals(Integer.MAX_VALUE)) { @@ -757,10 +757,10 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator } /* - LdbcSimpleQueryFactory + SimpleQueryFactory */ - private interface LdbcSimpleQueryFactory { + private interface SimpleQueryFactory { Operation create( Queue> accountIdBuffer, Queue personIdBuffer, @@ -911,7 +911,7 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator } } - private class NoOpFactory implements LdbcSimpleQueryFactory { + private class NoOpFactory implements SimpleQueryFactory { @Override public Operation create( Queue> accountIdBuffer, @@ -932,7 +932,7 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator } } - private class ErrorFactory implements LdbcSimpleQueryFactory { + private class ErrorFactory implements SimpleQueryFactory { private final Class operationType; private ErrorFactory(Class operationType) { @@ -961,14 +961,14 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator } } - private class CoinTossingFactory implements LdbcSimpleQueryFactory { + private class CoinTossingFactory implements SimpleQueryFactory { private final RandomDataGenerator random; - private final LdbcSimpleQueryFactory innerFactory; + private final SimpleQueryFactory innerFactory; private final double min; private final double max; private CoinTossingFactory(RandomDataGenerator random, - LdbcSimpleQueryFactory innerFactory, + SimpleQueryFactory innerFactory, double min, double max) { this.random = random; @@ -1013,12 +1013,12 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator } } - private class RoundRobbinFactory implements LdbcSimpleQueryFactory { - private final LdbcSimpleQueryFactory[] innerFactories; + private class RoundRobbinFactory implements SimpleQueryFactory { + private final SimpleQueryFactory[] innerFactories; private final int innerFactoriesCount; private int nextFactoryIndex; - private RoundRobbinFactory(LdbcSimpleQueryFactory... innerFactories) { + private RoundRobbinFactory(SimpleQueryFactory... innerFactories) { this.innerFactories = innerFactories; this.innerFactoriesCount = innerFactories.length; this.nextFactoryIndex = -1; @@ -1062,10 +1062,10 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator } } - private class LdbcSimpleQuery1Factory implements LdbcSimpleQueryFactory { + private class SimpleQuery1Factory implements SimpleQueryFactory { private final ScheduledStartTimeFactory scheduledStartTimeFactory; - private LdbcSimpleQuery1Factory(ScheduledStartTimePolicy scheduledStartTimePolicy) { + private SimpleQuery1Factory(ScheduledStartTimePolicy scheduledStartTimePolicy) { switch (scheduledStartTimePolicy) { case ESTIMATED: { this.scheduledStartTimeFactory = new EstimatedScheduledStartTimeFactory(); @@ -1123,10 +1123,10 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator } } - private class LdbcSimpleQuery2Factory implements LdbcSimpleQueryFactory { + private class SimpleQuery2Factory implements SimpleQueryFactory { private final ScheduledStartTimeFactory scheduledStartTimeFactory; - private LdbcSimpleQuery2Factory(ScheduledStartTimePolicy scheduledStartTimePolicy) { + private SimpleQuery2Factory(ScheduledStartTimePolicy scheduledStartTimePolicy) { switch (scheduledStartTimePolicy) { case ESTIMATED: { this.scheduledStartTimeFactory = new EstimatedScheduledStartTimeFactory(); @@ -1184,10 +1184,10 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator } } - private class LdbcSimpleQuery3Factory implements LdbcSimpleQueryFactory { + private class SimpleQuery3Factory implements SimpleQueryFactory { private final ScheduledStartTimeFactory scheduledStartTimeFactory; - private LdbcSimpleQuery3Factory(ScheduledStartTimePolicy scheduledStartTimePolicy) { + private SimpleQuery3Factory(ScheduledStartTimePolicy scheduledStartTimePolicy) { switch (scheduledStartTimePolicy) { case ESTIMATED: { this.scheduledStartTimeFactory = new EstimatedScheduledStartTimeFactory(); @@ -1245,10 +1245,10 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator } } - private class LdbcSimpleQuery4Factory implements LdbcSimpleQueryFactory { + private class SimpleQuery4Factory implements SimpleQueryFactory { private final ScheduledStartTimeFactory scheduledStartTimeFactory; - private LdbcSimpleQuery4Factory(ScheduledStartTimePolicy scheduledStartTimePolicy) { + private SimpleQuery4Factory(ScheduledStartTimePolicy scheduledStartTimePolicy) { switch (scheduledStartTimePolicy) { case ESTIMATED: { this.scheduledStartTimeFactory = new EstimatedScheduledStartTimeFactory(); @@ -1307,10 +1307,10 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator } } - private class LdbcSimpleQuery5Factory implements LdbcSimpleQueryFactory { + private class SimpleQuery5Factory implements SimpleQueryFactory { private final ScheduledStartTimeFactory scheduledStartTimeFactory; - private LdbcSimpleQuery5Factory(ScheduledStartTimePolicy scheduledStartTimePolicy) { + private SimpleQuery5Factory(ScheduledStartTimePolicy scheduledStartTimePolicy) { switch (scheduledStartTimePolicy) { case ESTIMATED: { this.scheduledStartTimeFactory = new EstimatedScheduledStartTimeFactory(); @@ -1373,10 +1373,10 @@ public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator ScheduledStartTimeFactory */ - private class LdbcSimpleQuery6Factory implements LdbcSimpleQueryFactory { + private class SimpleQuery6Factory implements SimpleQueryFactory { private final ScheduledStartTimeFactory scheduledStartTimeFactory; - private LdbcSimpleQuery6Factory(ScheduledStartTimePolicy scheduledStartTimePolicy) { + private SimpleQuery6Factory(ScheduledStartTimePolicy scheduledStartTimePolicy) { switch (scheduledStartTimePolicy) { case ESTIMATED: { this.scheduledStartTimeFactory = new EstimatedScheduledStartTimeFactory(); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchTransactionDbValidationParametersFilter.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionDbValidationParametersFilter.java similarity index 83% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchTransactionDbValidationParametersFilter.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionDbValidationParametersFilter.java index fabaf2d2d36ca9190f676a2e4f0ef23b08018262..7a317dd9213f7aff7b07902946c7b9d2a96a274c 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchTransactionDbValidationParametersFilter.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionDbValidationParametersFilter.java @@ -14,35 +14,35 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.Workload.DbValidationParametersFilter; -import org.ldbcouncil.finbench.driver.Workload.DbValidationParametersFilterAcceptance; -import org.ldbcouncil.finbench.driver.Workload.DbValidationParametersFilterResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead7; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead9; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead6; - -class LdbcFinBenchTransactionDbValidationParametersFilter implements DbValidationParametersFilter { +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.Workload.DbValidationParametersFilter; +import org.graphybench.driver.driver.Workload.DbValidationParametersFilterAcceptance; +import org.graphybench.driver.driver.Workload.DbValidationParametersFilterResult; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead1; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead3; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead4; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead6; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead7; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead9; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead1; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead2; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead3; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead4; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead5; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead6; + +class GraphyBenchTransactionDbValidationParametersFilter implements DbValidationParametersFilter { private final Map remainingRequiredResultsPerType; private final Set> enabledShortReadOperationTypes; - LdbcFinBenchTransactionDbValidationParametersFilter( + GraphyBenchTransactionDbValidationParametersFilter( Map remainingRequiredResultsPerType, Set> enabledShortReadOperationTypes) { this.remainingRequiredResultsPerType = remainingRequiredResultsPerType; @@ -108,7 +108,7 @@ class LdbcFinBenchTransactionDbValidationParametersFilter implements DbValidatio } /** - * Inject simple reads after a LdbcUpdate operation is scheduled. + * Inject simple reads after a Update operation is scheduled. * * @param operation The update operation * @return List of short reads operations @@ -121,7 +121,7 @@ class LdbcFinBenchTransactionDbValidationParametersFilter implements DbValidatio ComplexRead1 updateOperation = (ComplexRead1) operation; injectAccountSimples(operationsToInject, updateOperation.getId(), - LdbcFinBenchSimpleReadGenerator.THRESHOLD, + GraphyBenchSimpleReadGenerator.THRESHOLD, updateOperation.getStartTime(), updateOperation.getEndTime()); break; @@ -130,12 +130,12 @@ class LdbcFinBenchTransactionDbValidationParametersFilter implements DbValidatio ComplexRead3 updateOperation = (ComplexRead3) operation; injectAccountSimples(operationsToInject, updateOperation.getId1(), - LdbcFinBenchSimpleReadGenerator.THRESHOLD, + GraphyBenchSimpleReadGenerator.THRESHOLD, updateOperation.getStartTime(), updateOperation.getEndTime()); injectAccountSimples(operationsToInject, updateOperation.getId2(), - LdbcFinBenchSimpleReadGenerator.THRESHOLD, + GraphyBenchSimpleReadGenerator.THRESHOLD, updateOperation.getStartTime(), updateOperation.getEndTime()); break; @@ -144,12 +144,12 @@ class LdbcFinBenchTransactionDbValidationParametersFilter implements DbValidatio ComplexRead4 updateOperation = (ComplexRead4) operation; injectAccountSimples(operationsToInject, updateOperation.getId1(), - LdbcFinBenchSimpleReadGenerator.THRESHOLD, + GraphyBenchSimpleReadGenerator.THRESHOLD, updateOperation.getStartTime(), updateOperation.getEndTime()); injectAccountSimples(operationsToInject, updateOperation.getId2(), - LdbcFinBenchSimpleReadGenerator.THRESHOLD, + GraphyBenchSimpleReadGenerator.THRESHOLD, updateOperation.getStartTime(), updateOperation.getEndTime()); break; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchTransactionWorkload.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java similarity index 68% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchTransactionWorkload.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java index 31c8591cdf4a93c8ce848044523b5c4a9309f7e1..2f39ed2a98525e9f470dc1fa081ca43914473613 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchTransactionWorkload.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import static java.lang.String.format; @@ -42,38 +42,38 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import org.ldbcouncil.finbench.driver.ChildOperationGenerator; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.WorkloadStreams; -import org.ldbcouncil.finbench.driver.control.ConsoleAndFileDriverConfiguration; -import org.ldbcouncil.finbench.driver.control.OperationMode; -import org.ldbcouncil.finbench.driver.csv.DuckDbExtractor; -import org.ldbcouncil.finbench.driver.csv.FileLoader; -import org.ldbcouncil.finbench.driver.generator.BufferedIterator; -import org.ldbcouncil.finbench.driver.generator.EventStreamReader; -import org.ldbcouncil.finbench.driver.generator.GeneratorFactory; -import org.ldbcouncil.finbench.driver.generator.OperationStreamBuffer; -import org.ldbcouncil.finbench.driver.generator.RandomDataGeneratorFactory; -import org.ldbcouncil.finbench.driver.util.ClassLoaderHelper; -import org.ldbcouncil.finbench.driver.util.ClassLoadingException; -import org.ldbcouncil.finbench.driver.util.MapUtils; -import org.ldbcouncil.finbench.driver.util.Tuple4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead10; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead11; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead12; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead7; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead8; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead9; - -public class LdbcFinBenchTransactionWorkload extends Workload { +import org.graphybench.driver.driver.ChildOperationGenerator; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.WorkloadStreams; +import org.graphybench.driver.driver.control.ConsoleAndFileDriverConfiguration; +import org.graphybench.driver.driver.control.OperationMode; +import org.graphybench.driver.driver.csv.DuckDbExtractor; +import org.graphybench.driver.driver.csv.FileLoader; +import org.graphybench.driver.driver.generator.BufferedIterator; +import org.graphybench.driver.driver.generator.EventStreamReader; +import org.graphybench.driver.driver.generator.GeneratorFactory; +import org.graphybench.driver.driver.generator.OperationStreamBuffer; +import org.graphybench.driver.driver.generator.RandomDataGeneratorFactory; +import org.graphybench.driver.driver.util.ClassLoaderHelper; +import org.graphybench.driver.driver.util.ClassLoadingException; +import org.graphybench.driver.driver.util.MapUtils; +import org.graphybench.driver.driver.util.Tuple4; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead1; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead10; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead11; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead12; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead2; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead3; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead4; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead5; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead6; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead7; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead8; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead9; + +public class GraphyBenchTransactionWorkload extends Workload { private Map longReadInterleavesAsMilli; private File parametersDir; private File updatesDir; @@ -93,7 +93,7 @@ public class LdbcFinBenchTransactionWorkload extends Workload { @Override public Map> operationTypeToClassMapping() { - return LdbcFinBenchTransactionWorkloadConfiguration.operationTypeToClassMapping(); + return GraphyBenchTransactionWorkloadConfiguration.operationTypeToClassMapping(); } @Override @@ -107,28 +107,28 @@ public class LdbcFinBenchTransactionWorkload extends Workload { // Validation mode does not require parameter directory if (operationMode != OperationMode.VALIDATE_DATABASE) { - compulsoryKeys.add(LdbcFinBenchTransactionWorkloadConfiguration.PARAMETERS_DIRECTORY); + compulsoryKeys.add(GraphyBenchTransactionWorkloadConfiguration.PARAMETERS_DIRECTORY); } - if (params.containsKey(LdbcFinBenchTransactionWorkloadConfiguration.BATCH_SIZE)) { - batchSize = Double.parseDouble(params.get(LdbcFinBenchTransactionWorkloadConfiguration.BATCH_SIZE)); + if (params.containsKey(GraphyBenchTransactionWorkloadConfiguration.BATCH_SIZE)) { + batchSize = Double.parseDouble(params.get(GraphyBenchTransactionWorkloadConfiguration.BATCH_SIZE)); } else { - batchSize = LdbcFinBenchTransactionWorkloadConfiguration.DEFAULT_BATCH_SIZE; + batchSize = GraphyBenchTransactionWorkloadConfiguration.DEFAULT_BATCH_SIZE; } - compulsoryKeys.addAll(LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_ENABLE_KEYS); - compulsoryKeys.addAll(LdbcFinBenchTransactionWorkloadConfiguration.WRITE_OPERATION_ENABLE_KEYS); - compulsoryKeys.addAll(LdbcFinBenchTransactionWorkloadConfiguration.SIMPLE_READ_OPERATION_ENABLE_KEYS); + compulsoryKeys.addAll(GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_ENABLE_KEYS); + compulsoryKeys.addAll(GraphyBenchTransactionWorkloadConfiguration.WRITE_OPERATION_ENABLE_KEYS); + compulsoryKeys.addAll(GraphyBenchTransactionWorkloadConfiguration.SIMPLE_READ_OPERATION_ENABLE_KEYS); Set missingPropertyParameters = - LdbcFinBenchTransactionWorkloadConfiguration.missingParameters(params, compulsoryKeys); + GraphyBenchTransactionWorkloadConfiguration.missingParameters(params, compulsoryKeys); if (!missingPropertyParameters.isEmpty()) { throw new WorkloadException(format("Workload could not initialize due to missing parameters: %s", missingPropertyParameters.toString())); } - if (params.containsKey(LdbcFinBenchTransactionWorkloadConfiguration.UPDATES_DIRECTORY)) { - updatesDir = new File(params.get(LdbcFinBenchTransactionWorkloadConfiguration.UPDATES_DIRECTORY).trim()); + if (params.containsKey(GraphyBenchTransactionWorkloadConfiguration.UPDATES_DIRECTORY)) { + updatesDir = new File(params.get(GraphyBenchTransactionWorkloadConfiguration.UPDATES_DIRECTORY).trim()); if (!updatesDir.exists()) { throw new WorkloadException( format("Updates directory does not exist%nDirectory: %s", @@ -142,21 +142,21 @@ public class LdbcFinBenchTransactionWorkload extends Workload { } if (operationMode != OperationMode.VALIDATE_DATABASE) { - if (params.containsKey(LdbcFinBenchTransactionWorkloadConfiguration.FILES_SUFFIX)) { - fileSuffix = params.get(LdbcFinBenchTransactionWorkloadConfiguration.FILES_SUFFIX).trim(); + if (params.containsKey(GraphyBenchTransactionWorkloadConfiguration.FILES_SUFFIX)) { + fileSuffix = params.get(GraphyBenchTransactionWorkloadConfiguration.FILES_SUFFIX).trim(); } else { - fileSuffix = LdbcFinBenchTransactionWorkloadConfiguration.DEFAULT_FILE_SUFFIX; + fileSuffix = GraphyBenchTransactionWorkloadConfiguration.DEFAULT_FILE_SUFFIX; } parametersDir = - new File(params.get(LdbcFinBenchTransactionWorkloadConfiguration.PARAMETERS_DIRECTORY).trim()); + new File(params.get(GraphyBenchTransactionWorkloadConfiguration.PARAMETERS_DIRECTORY).trim()); if (!parametersDir.exists()) { throw new WorkloadException( format("Parameters directory does not exist: %s", parametersDir.getAbsolutePath())); } for (String readOperationParamsFilename : - LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_PARAMS_FILENAMES.values()) { + GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_PARAMS_FILENAMES.values()) { File readOperationParamsFile = new File(parametersDir, readOperationParamsFilename - + LdbcFinBenchTransactionWorkloadConfiguration.FILE_SEPARATOR + fileSuffix); + + GraphyBenchTransactionWorkloadConfiguration.FILE_SEPARATOR + fileSuffix); if (!readOperationParamsFile.exists()) { throw new WorkloadException( format("Read operation parameters file does not exist: %s", @@ -166,46 +166,46 @@ public class LdbcFinBenchTransactionWorkload extends Workload { } enabledLongReadOperationTypes = - getEnabledOperationsHashset(LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_ENABLE_KEYS, + getEnabledOperationsHashset(GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_ENABLE_KEYS, params); enabledSimpleReadOperationTypes = - getEnabledOperationsHashset(LdbcFinBenchTransactionWorkloadConfiguration.SIMPLE_READ_OPERATION_ENABLE_KEYS, + getEnabledOperationsHashset(GraphyBenchTransactionWorkloadConfiguration.SIMPLE_READ_OPERATION_ENABLE_KEYS, params); if (!enabledSimpleReadOperationTypes.isEmpty()) { - if (!params.containsKey(LdbcFinBenchTransactionWorkloadConfiguration.simple_read_dissipation)) { + if (!params.containsKey(GraphyBenchTransactionWorkloadConfiguration.simple_read_dissipation)) { throw new WorkloadException(format("Configuration parameter missing: %s", - LdbcFinBenchTransactionWorkloadConfiguration.simple_read_dissipation)); + GraphyBenchTransactionWorkloadConfiguration.simple_read_dissipation)); } simpleReadDissipationFactor = Double.parseDouble( - params.get(LdbcFinBenchTransactionWorkloadConfiguration.simple_read_dissipation).trim() + params.get(GraphyBenchTransactionWorkloadConfiguration.simple_read_dissipation).trim() ); if (simpleReadDissipationFactor < 0 || simpleReadDissipationFactor > 1) { throw new WorkloadException( format("Configuration parameter %s should be in interval [1.0,0.0] but is: %s", - LdbcFinBenchTransactionWorkloadConfiguration.simple_read_dissipation, + GraphyBenchTransactionWorkloadConfiguration.simple_read_dissipation, simpleReadDissipationFactor)); } } enabledWriteOperationTypes = - getEnabledOperationsHashset(LdbcFinBenchTransactionWorkloadConfiguration.WRITE_OPERATION_ENABLE_KEYS, + getEnabledOperationsHashset(GraphyBenchTransactionWorkloadConfiguration.WRITE_OPERATION_ENABLE_KEYS, params); //enabledDeleteOperationTypes = getEnabledOperationsHashset - // (LdbcFinBenchTransactionWorkloadConfiguration.DELETE_OPERATION_ENABLE_KEYS, params); + // (GraphyBenchTransactionWorkloadConfiguration.DELETE_OPERATION_ENABLE_KEYS, params); enabledUpdateOperationTypes = new HashSet>(enabledWriteOperationTypes); // enabledUpdateOperationTypes.addAll(enabledDeleteOperationTypes); // First load the scale factor from the provided properties file, then load the frequency keys from resources - if (!params.containsKey(LdbcFinBenchTransactionWorkloadConfiguration.SCALE_FACTOR)) { + if (!params.containsKey(GraphyBenchTransactionWorkloadConfiguration.SCALE_FACTOR)) { // if SCALE_FACTOR is missing but writes are enabled it is an error throw new WorkloadException( format("Workload could not initialize. Missing parameter: %s", - LdbcFinBenchTransactionWorkloadConfiguration.SCALE_FACTOR)); + GraphyBenchTransactionWorkloadConfiguration.SCALE_FACTOR)); } - String scaleFactor = params.get(LdbcFinBenchTransactionWorkloadConfiguration.SCALE_FACTOR).trim(); + String scaleFactor = params.get(GraphyBenchTransactionWorkloadConfiguration.SCALE_FACTOR).trim(); // Load the frequencyKeys for the appropiate scale factor if that scale factor is supported - String scaleFactorPropertiesPath = "configuration/ldbc/finbench/transaction/sf" + scaleFactor + ".properties"; + String scaleFactorPropertiesPath = "configuration/graphybench/transaction/sf" + scaleFactor + ".properties"; // Load the properties file, throw error if file is not present (and thus not supported) final Properties scaleFactorProperties = new Properties(); @@ -225,10 +225,10 @@ public class LdbcFinBenchTransactionWorkload extends Workload { if (OperationMode.valueOf(params.get(ConsoleAndFileDriverConfiguration.MODE_ARG)) == OperationMode.CREATE_VALIDATION) { Map freqs = new HashMap(); - String updateInterleave = tmp.get(LdbcFinBenchTransactionWorkloadConfiguration.UPDATE_INTERLEAVE); - freqs.put(LdbcFinBenchTransactionWorkloadConfiguration.UPDATE_INTERLEAVE, updateInterleave); + String updateInterleave = tmp.get(GraphyBenchTransactionWorkloadConfiguration.UPDATE_INTERLEAVE); + freqs.put(GraphyBenchTransactionWorkloadConfiguration.UPDATE_INTERLEAVE, updateInterleave); for (String operationFrequencyKey : - LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_FREQUENCY_KEYS) { + GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_FREQUENCY_KEYS) { freqs.put(operationFrequencyKey, "1"); } freqs.keySet().removeAll(params.keySet()); @@ -239,35 +239,35 @@ public class LdbcFinBenchTransactionWorkload extends Workload { } List frequencyKeys = - Lists.newArrayList(LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_FREQUENCY_KEYS); - Set missingFrequencyKeys = LdbcFinBenchTransactionWorkloadConfiguration + Lists.newArrayList(GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_FREQUENCY_KEYS); + Set missingFrequencyKeys = GraphyBenchTransactionWorkloadConfiguration .missingParameters(params, frequencyKeys); if (enabledUpdateOperationTypes.isEmpty() - && !params.containsKey(LdbcFinBenchTransactionWorkloadConfiguration.UPDATE_INTERLEAVE)) { + && !params.containsKey(GraphyBenchTransactionWorkloadConfiguration.UPDATE_INTERLEAVE)) { // if UPDATE_INTERLEAVE is missing and writes are disabled set it to DEFAULT params.put( - LdbcFinBenchTransactionWorkloadConfiguration.UPDATE_INTERLEAVE, - LdbcFinBenchTransactionWorkloadConfiguration.DEFAULT_UPDATE_INTERLEAVE + GraphyBenchTransactionWorkloadConfiguration.UPDATE_INTERLEAVE, + GraphyBenchTransactionWorkloadConfiguration.DEFAULT_UPDATE_INTERLEAVE ); } - if (!params.containsKey(LdbcFinBenchTransactionWorkloadConfiguration.UPDATE_INTERLEAVE)) { + if (!params.containsKey(GraphyBenchTransactionWorkloadConfiguration.UPDATE_INTERLEAVE)) { // if UPDATE_INTERLEAVE is missing but writes are enabled it is an error throw new WorkloadException( format("Workload could not initialize. Missing parameter: %s", - LdbcFinBenchTransactionWorkloadConfiguration.UPDATE_INTERLEAVE)); + GraphyBenchTransactionWorkloadConfiguration.UPDATE_INTERLEAVE)); } updateInterleaveAsMilli = - Integer.parseInt(params.get(LdbcFinBenchTransactionWorkloadConfiguration.UPDATE_INTERLEAVE).trim()); + Integer.parseInt(params.get(GraphyBenchTransactionWorkloadConfiguration.UPDATE_INTERLEAVE).trim()); if (missingFrequencyKeys.isEmpty()) { // all frequency arguments were given, compute interleave based on frequencies - params = LdbcFinBenchTransactionWorkloadConfiguration.convertFrequenciesToInterleaves(params); + params = GraphyBenchTransactionWorkloadConfiguration.convertFrequenciesToInterleaves(params); } else { // if any frequencies are not set, there should be specified interleave times for read queries - Set missingInterleaveKeys = LdbcFinBenchTransactionWorkloadConfiguration.missingParameters( + Set missingInterleaveKeys = GraphyBenchTransactionWorkloadConfiguration.missingParameters( params, - LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_INTERLEAVE_KEYS + GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_INTERLEAVE_KEYS ); if (!missingInterleaveKeys.isEmpty()) { throw new WorkloadException(format( @@ -279,40 +279,40 @@ public class LdbcFinBenchTransactionWorkload extends Workload { try { longReadInterleavesAsMilli = new HashMap<>(); longReadInterleavesAsMilli.put(ComplexRead1.TYPE, Long.parseLong( - params.get(LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_1_INTERLEAVE_KEY) + params.get(GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_1_INTERLEAVE_KEY) .trim())); longReadInterleavesAsMilli.put(ComplexRead2.TYPE, Long.parseLong( - params.get(LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_2_INTERLEAVE_KEY) + params.get(GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_2_INTERLEAVE_KEY) .trim())); longReadInterleavesAsMilli.put(ComplexRead3.TYPE, Long.parseLong( - params.get(LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_3_INTERLEAVE_KEY) + params.get(GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_3_INTERLEAVE_KEY) .trim())); longReadInterleavesAsMilli.put(ComplexRead4.TYPE, Long.parseLong( - params.get(LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_4_INTERLEAVE_KEY) + params.get(GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_4_INTERLEAVE_KEY) .trim())); longReadInterleavesAsMilli.put(ComplexRead5.TYPE, Long.parseLong( - params.get(LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_5_INTERLEAVE_KEY) + params.get(GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_5_INTERLEAVE_KEY) .trim())); longReadInterleavesAsMilli.put(ComplexRead6.TYPE, Long.parseLong( - params.get(LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_6_INTERLEAVE_KEY) + params.get(GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_6_INTERLEAVE_KEY) .trim())); longReadInterleavesAsMilli.put(ComplexRead7.TYPE, Long.parseLong( - params.get(LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_7_INTERLEAVE_KEY) + params.get(GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_7_INTERLEAVE_KEY) .trim())); longReadInterleavesAsMilli.put(ComplexRead8.TYPE, Long.parseLong( - params.get(LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_8_INTERLEAVE_KEY) + params.get(GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_8_INTERLEAVE_KEY) .trim())); longReadInterleavesAsMilli.put(ComplexRead9.TYPE, Long.parseLong( - params.get(LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_9_INTERLEAVE_KEY) + params.get(GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_9_INTERLEAVE_KEY) .trim())); longReadInterleavesAsMilli.put(ComplexRead10.TYPE, Long.parseLong( - params.get(LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_10_INTERLEAVE_KEY) + params.get(GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_10_INTERLEAVE_KEY) .trim())); longReadInterleavesAsMilli.put(ComplexRead11.TYPE, Long.parseLong( - params.get(LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_11_INTERLEAVE_KEY) + params.get(GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_11_INTERLEAVE_KEY) .trim())); longReadInterleavesAsMilli.put(ComplexRead12.TYPE, Long.parseLong( - params.get(LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_12_INTERLEAVE_KEY) + params.get(GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_12_INTERLEAVE_KEY) .trim())); } catch (NumberFormatException e) { @@ -332,21 +332,21 @@ public class LdbcFinBenchTransactionWorkload extends Workload { * @return */ private Set> getEnabledOperationsHashset(List enabledOperationKeys, - Map params) + Map params) throws WorkloadException { Set> enabledOperationTypes = new HashSet<>(); for (String operationEnableKey : enabledOperationKeys) { String operationEnabledString = params.get(operationEnableKey).trim(); Boolean operationEnabled = Boolean.parseBoolean(operationEnabledString); String operationClassName = - LdbcFinBenchTransactionWorkloadConfiguration.LDBC_FINBENCH_TRANSACTION_PACKAGE_PREFIX - + LdbcFinBenchTransactionWorkloadConfiguration.removePrefix( - LdbcFinBenchTransactionWorkloadConfiguration.removeSuffix( + GraphyBenchTransactionWorkloadConfiguration.GRAPHYBENCH_TRANSACTION_PACKAGE_PREFIX + + GraphyBenchTransactionWorkloadConfiguration.removePrefix( + GraphyBenchTransactionWorkloadConfiguration.removeSuffix( operationEnableKey, - LdbcFinBenchTransactionWorkloadConfiguration.ENABLE_SUFFIX + GraphyBenchTransactionWorkloadConfiguration.ENABLE_SUFFIX ), - LdbcFinBenchTransactionWorkloadConfiguration - .LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + GraphyBenchTransactionWorkloadConfiguration + .GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX ); try { Class operationClass = ClassLoaderHelper.loadClass(operationClassName); @@ -368,7 +368,7 @@ public class LdbcFinBenchTransactionWorkload extends Workload { @Override public Class getOperationClass() { - return LdbcOperation.class; + return GraphyBenchOperation.class; } @Override @@ -429,8 +429,8 @@ public class LdbcFinBenchTransactionWorkload extends Workload { Iterator eventOperationStream = readOperationStream.readOperationStream( decoders.get(type), new File(parametersDir, - LdbcFinBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_PARAMS_FILENAMES.get(type) - + LdbcFinBenchTransactionWorkloadConfiguration.FILE_SEPARATOR + fileSuffix) + GraphyBenchTransactionWorkloadConfiguration.COMPLEX_READ_OPERATION_PARAMS_FILENAMES.get(type) + + GraphyBenchTransactionWorkloadConfiguration.FILE_SEPARATOR + fileSuffix) ); long readOperationInterleaveAsMilli = longReadInterleavesAsMilli.get(type); Iterator operationStartTimes = @@ -452,34 +452,34 @@ public class LdbcFinBenchTransactionWorkload extends Workload { * @param hasDbConnected Whether a database is connected * @return */ - private LdbcFinBenchSimpleReadGenerator getSimpleReadGenerator(boolean hasDbConnected) { + private GraphyBenchSimpleReadGenerator getSimpleReadGenerator(boolean hasDbConnected) { RandomDataGeneratorFactory randomFactory = new RandomDataGeneratorFactory(42L); double initialProbability = 1.0; Queue> accountIdBuffer; Queue personIdBuffer; Queue companyIdBuffer; - LdbcFinBenchSimpleReadGenerator.ScheduledStartTimePolicy scheduledStartTimePolicy; - LdbcFinBenchSimpleReadGenerator.BufferReplenishFun bufferReplenishFun; + GraphyBenchSimpleReadGenerator.ScheduledStartTimePolicy scheduledStartTimePolicy; + GraphyBenchSimpleReadGenerator.BufferReplenishFun bufferReplenishFun; if (hasDbConnected) { - accountIdBuffer = LdbcFinBenchSimpleReadGenerator.synchronizedCircularTuple4QueueBuffer(1024); - personIdBuffer = LdbcFinBenchSimpleReadGenerator.synchronizedCircularQueueBuffer(1024); - companyIdBuffer = LdbcFinBenchSimpleReadGenerator.synchronizedCircularQueueBuffer(1024); + accountIdBuffer = GraphyBenchSimpleReadGenerator.synchronizedCircularTuple4QueueBuffer(1024); + personIdBuffer = GraphyBenchSimpleReadGenerator.synchronizedCircularQueueBuffer(1024); + companyIdBuffer = GraphyBenchSimpleReadGenerator.synchronizedCircularQueueBuffer(1024); scheduledStartTimePolicy = - LdbcFinBenchSimpleReadGenerator.ScheduledStartTimePolicy.PREVIOUS_OPERATION_ACTUAL_FINISH_TIME; + GraphyBenchSimpleReadGenerator.ScheduledStartTimePolicy.PREVIOUS_OPERATION_ACTUAL_FINISH_TIME; bufferReplenishFun = - new LdbcFinBenchSimpleReadGenerator.ResultBufferReplenishFun(accountIdBuffer, personIdBuffer, + new GraphyBenchSimpleReadGenerator.ResultBufferReplenishFun(accountIdBuffer, personIdBuffer, companyIdBuffer); } else { - accountIdBuffer = LdbcFinBenchSimpleReadGenerator.constantTuple4Buffer( + accountIdBuffer = GraphyBenchSimpleReadGenerator.constantTuple4Buffer( new Tuple4<>(1L, 1D, new Date(), new Date())); - personIdBuffer = LdbcFinBenchSimpleReadGenerator.constantBuffer(1); - companyIdBuffer = LdbcFinBenchSimpleReadGenerator.constantBuffer(1); + personIdBuffer = GraphyBenchSimpleReadGenerator.constantBuffer(1); + companyIdBuffer = GraphyBenchSimpleReadGenerator.constantBuffer(1); scheduledStartTimePolicy = - LdbcFinBenchSimpleReadGenerator.ScheduledStartTimePolicy.PREVIOUS_OPERATION_SCHEDULED_START_TIME; - bufferReplenishFun = new LdbcFinBenchSimpleReadGenerator.NoOpBufferReplenishFun(); + GraphyBenchSimpleReadGenerator.ScheduledStartTimePolicy.PREVIOUS_OPERATION_SCHEDULED_START_TIME; + bufferReplenishFun = new GraphyBenchSimpleReadGenerator.NoOpBufferReplenishFun(); } - return new LdbcFinBenchSimpleReadGenerator( + return new GraphyBenchSimpleReadGenerator( initialProbability, simpleReadDissipationFactor, updateInterleaveAsMilli, @@ -500,7 +500,7 @@ public class LdbcFinBenchTransactionWorkload extends Workload { protected WorkloadStreams getStreams(GeneratorFactory gf, boolean hasDbConnected) throws WorkloadException { long workloadStartTimeAsMilli = Long.MAX_VALUE; - WorkloadStreams ldbcFinbenchWorkloadStreams = new WorkloadStreams(); + WorkloadStreams GraphybenchWorkloadStreams = new WorkloadStreams(); Iterator asynchronousDependencyStreams; List> asynchronousNonDependencyStreamsList; Set> dependentAsynchronousOperationTypes = Sets.newHashSet(); @@ -566,7 +566,7 @@ public class LdbcFinBenchTransactionWorkload extends Workload { /* * FINAL STREAMS */ - ldbcFinbenchWorkloadStreams.setAsynchronousStream( + GraphybenchWorkloadStreams.setAsynchronousStream( dependentAsynchronousOperationTypes, dependencyAsynchronousOperationTypes, asynchronousDependencyStreams, @@ -574,7 +574,7 @@ public class LdbcFinBenchTransactionWorkload extends Workload { simpleReadsChildGenerator ); - return ldbcFinbenchWorkloadStreams; + return GraphybenchWorkloadStreams; } @Override @@ -599,7 +599,7 @@ public class LdbcFinBenchTransactionWorkload extends Workload { dependencyUpdateOperationTypes.add(class1); } - int batchQueueSize = LdbcFinBenchTransactionWorkloadConfiguration.BUFFERED_QUEUE_SIZE; + int batchQueueSize = GraphyBenchTransactionWorkloadConfiguration.BUFFERED_QUEUE_SIZE; BlockingQueue> blockingQueue = new LinkedBlockingQueue<>(batchQueueSize); CountDownLatch finishInit = new CountDownLatch(1); @@ -653,7 +653,7 @@ public class LdbcFinBenchTransactionWorkload extends Workload { remainingRequiredResultsPerType.put(simpleReadOperationType, minimumResultCountPerOperationType); } - return new LdbcFinBenchTransactionDbValidationParametersFilter( + return new GraphyBenchTransactionDbValidationParametersFilter( remainingRequiredResultsPerType, // Writes are required to determine short reads operations to inject enabledSimpleReadOperationTypes diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchTransactionWorkloadConfiguration.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkloadConfiguration.java similarity index 81% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchTransactionWorkloadConfiguration.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkloadConfiguration.java index 3ddbfd11c255fd017e21a26741f454322c1ca1d4..5c7d6aa52c3178c3b6629313114bfd42305a5202 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchTransactionWorkloadConfiguration.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkloadConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import static java.lang.String.format; @@ -30,79 +30,79 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.control.ConsoleAndFileDriverConfiguration; -import org.ldbcouncil.finbench.driver.control.DriverConfigurationException; -import org.ldbcouncil.finbench.driver.util.FileUtils; -import org.ldbcouncil.finbench.driver.util.MapUtils; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead10; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead11; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead12; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead7; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead8; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead9; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ReadWrite1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ReadWrite2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ReadWrite3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write10; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write11; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write12; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write13; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write14; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write15; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write16; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write17; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write18; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write19; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write7; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write8; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write9; - -public abstract class LdbcFinBenchTransactionWorkloadConfiguration { +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.control.ConsoleAndFileDriverConfiguration; +import org.graphybench.driver.driver.control.DriverConfigurationException; +import org.graphybench.driver.driver.util.FileUtils; +import org.graphybench.driver.driver.util.MapUtils; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead1; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead10; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead11; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead12; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead2; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead3; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead4; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead5; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead6; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead7; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead8; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead9; +import org.graphybench.driver.driver.workloads.transaction.queries.ReadWrite1; +import org.graphybench.driver.driver.workloads.transaction.queries.ReadWrite2; +import org.graphybench.driver.driver.workloads.transaction.queries.ReadWrite3; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead1; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead2; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead3; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead4; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead5; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead6; +import org.graphybench.driver.driver.workloads.transaction.queries.Write1; +import org.graphybench.driver.driver.workloads.transaction.queries.Write10; +import org.graphybench.driver.driver.workloads.transaction.queries.Write11; +import org.graphybench.driver.driver.workloads.transaction.queries.Write12; +import org.graphybench.driver.driver.workloads.transaction.queries.Write13; +import org.graphybench.driver.driver.workloads.transaction.queries.Write14; +import org.graphybench.driver.driver.workloads.transaction.queries.Write15; +import org.graphybench.driver.driver.workloads.transaction.queries.Write16; +import org.graphybench.driver.driver.workloads.transaction.queries.Write17; +import org.graphybench.driver.driver.workloads.transaction.queries.Write18; +import org.graphybench.driver.driver.workloads.transaction.queries.Write19; +import org.graphybench.driver.driver.workloads.transaction.queries.Write2; +import org.graphybench.driver.driver.workloads.transaction.queries.Write3; +import org.graphybench.driver.driver.workloads.transaction.queries.Write4; +import org.graphybench.driver.driver.workloads.transaction.queries.Write5; +import org.graphybench.driver.driver.workloads.transaction.queries.Write6; +import org.graphybench.driver.driver.workloads.transaction.queries.Write7; +import org.graphybench.driver.driver.workloads.transaction.queries.Write8; +import org.graphybench.driver.driver.workloads.transaction.queries.Write9; + +public abstract class GraphyBenchTransactionWorkloadConfiguration { public static final int WRITE_OPERATION_NO_RESULT_DEFAULT_RESULT = -1; - public static final String LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX = "ldbc.finbench.transaction.queries."; + public static final String GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX = "graphybench.transaction.queries."; // directory that contains the substitution parameters files - public static final String PARAMETERS_DIRECTORY = LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + "parameters_dir"; + public static final String PARAMETERS_DIRECTORY = GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + "parameters_dir"; // directory containing forum and person update event streams - public static final String UPDATES_DIRECTORY = LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + "updates_dir"; + public static final String UPDATES_DIRECTORY = GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + "updates_dir"; // the parameter and updates files suffix - public static final String FILES_SUFFIX = LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + "files_suffix"; + public static final String FILES_SUFFIX = GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + "files_suffix"; // Simple reads random walk dissipation rate, in the interval [1.0-0.0] // Higher values translate to shorter walks and therefore fewer simple reads public static final String simple_read_dissipation = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + "simple_read_dissipation"; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + "simple_read_dissipation"; // Average distance between updates in simulation time - public static final String UPDATE_INTERLEAVE = LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + "update_interleave"; + public static final String UPDATE_INTERLEAVE = GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + "update_interleave"; - public static final String SCALE_FACTOR = LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + "scale_factor"; - public static final String UPDATE_STREAM_PARSER = LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + "update_parser"; + public static final String SCALE_FACTOR = GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + "scale_factor"; + public static final String UPDATE_STREAM_PARSER = GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + "update_parser"; public static final UpdateStreamParser DEFAULT_UPDATE_STREAM_PARSER = UpdateStreamParser.CHAR_SEEKER; - public static final String LDBC_transaction_PACKAGE_PREFIX = + public static final String transaction_PACKAGE_PREFIX = removeSuffix(ComplexRead1.class.getName(), ComplexRead1.class.getSimpleName()); - public static final String BATCH_SIZE = LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + "batch_size"; + public static final String BATCH_SIZE = GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + "batch_size"; // Default batch size denotes 24 hours of data public static final long DEFAULT_BATCH_SIZE = 24L; @@ -114,7 +114,7 @@ public abstract class LdbcFinBenchTransactionWorkloadConfiguration { public static final String FILE_SEPARATOR = "."; public static final String DEFAULT_FILE_SUFFIX = "csv"; - public static final String LDBC_FINBENCH_TRANSACTION_PACKAGE_PREFIX = + public static final String GRAPHYBENCH_TRANSACTION_PACKAGE_PREFIX = removeSuffix(ComplexRead1.class.getName(), ComplexRead1.class.getSimpleName()); /* @@ -122,29 +122,29 @@ public abstract class LdbcFinBenchTransactionWorkloadConfiguration { */ public static final String INTERLEAVE_SUFFIX = "_transaction"; public static final String COMPLEX_READ_OPERATION_1_INTERLEAVE_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead1.class.getSimpleName() + INTERLEAVE_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead1.class.getSimpleName() + INTERLEAVE_SUFFIX; public static final String COMPLEX_READ_OPERATION_2_INTERLEAVE_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead2.class.getSimpleName() + INTERLEAVE_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead2.class.getSimpleName() + INTERLEAVE_SUFFIX; public static final String COMPLEX_READ_OPERATION_3_INTERLEAVE_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead3.class.getSimpleName() + INTERLEAVE_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead3.class.getSimpleName() + INTERLEAVE_SUFFIX; public static final String COMPLEX_READ_OPERATION_4_INTERLEAVE_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead4.class.getSimpleName() + INTERLEAVE_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead4.class.getSimpleName() + INTERLEAVE_SUFFIX; public static final String COMPLEX_READ_OPERATION_5_INTERLEAVE_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead5.class.getSimpleName() + INTERLEAVE_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead5.class.getSimpleName() + INTERLEAVE_SUFFIX; public static final String COMPLEX_READ_OPERATION_6_INTERLEAVE_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead6.class.getSimpleName() + INTERLEAVE_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead6.class.getSimpleName() + INTERLEAVE_SUFFIX; public static final String COMPLEX_READ_OPERATION_7_INTERLEAVE_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead7.class.getSimpleName() + INTERLEAVE_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead7.class.getSimpleName() + INTERLEAVE_SUFFIX; public static final String COMPLEX_READ_OPERATION_8_INTERLEAVE_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead8.class.getSimpleName() + INTERLEAVE_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead8.class.getSimpleName() + INTERLEAVE_SUFFIX; public static final String COMPLEX_READ_OPERATION_9_INTERLEAVE_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead9.class.getSimpleName() + INTERLEAVE_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead9.class.getSimpleName() + INTERLEAVE_SUFFIX; public static final String COMPLEX_READ_OPERATION_10_INTERLEAVE_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead10.class.getSimpleName() + INTERLEAVE_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead10.class.getSimpleName() + INTERLEAVE_SUFFIX; public static final String COMPLEX_READ_OPERATION_11_INTERLEAVE_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead11.class.getSimpleName() + INTERLEAVE_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead11.class.getSimpleName() + INTERLEAVE_SUFFIX; public static final String COMPLEX_READ_OPERATION_12_INTERLEAVE_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead12.class.getSimpleName() + INTERLEAVE_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead12.class.getSimpleName() + INTERLEAVE_SUFFIX; public static final List COMPLEX_READ_OPERATION_INTERLEAVE_KEYS = Lists.newArrayList( COMPLEX_READ_OPERATION_1_INTERLEAVE_KEY, COMPLEX_READ_OPERATION_2_INTERLEAVE_KEY, @@ -164,29 +164,29 @@ public abstract class LdbcFinBenchTransactionWorkloadConfiguration { */ public static final String FREQUENCY_SUFFIX = "_freq"; public static final String COMPLEX_READ_OPERATION_1_FREQUENCY_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead1.class.getSimpleName() + FREQUENCY_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead1.class.getSimpleName() + FREQUENCY_SUFFIX; public static final String COMPLEX_READ_OPERATION_2_FREQUENCY_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead2.class.getSimpleName() + FREQUENCY_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead2.class.getSimpleName() + FREQUENCY_SUFFIX; public static final String COMPLEX_READ_OPERATION_3_FREQUENCY_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead3.class.getSimpleName() + FREQUENCY_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead3.class.getSimpleName() + FREQUENCY_SUFFIX; public static final String COMPLEX_READ_OPERATION_4_FREQUENCY_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead4.class.getSimpleName() + FREQUENCY_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead4.class.getSimpleName() + FREQUENCY_SUFFIX; public static final String COMPLEX_READ_OPERATION_5_FREQUENCY_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead5.class.getSimpleName() + FREQUENCY_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead5.class.getSimpleName() + FREQUENCY_SUFFIX; public static final String COMPLEX_READ_OPERATION_6_FREQUENCY_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead6.class.getSimpleName() + FREQUENCY_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead6.class.getSimpleName() + FREQUENCY_SUFFIX; public static final String COMPLEX_READ_OPERATION_7_FREQUENCY_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead7.class.getSimpleName() + FREQUENCY_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead7.class.getSimpleName() + FREQUENCY_SUFFIX; public static final String COMPLEX_READ_OPERATION_8_FREQUENCY_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead8.class.getSimpleName() + FREQUENCY_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead8.class.getSimpleName() + FREQUENCY_SUFFIX; public static final String COMPLEX_READ_OPERATION_9_FREQUENCY_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead9.class.getSimpleName() + FREQUENCY_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead9.class.getSimpleName() + FREQUENCY_SUFFIX; public static final String COMPLEX_READ_OPERATION_10_FREQUENCY_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead10.class.getSimpleName() + FREQUENCY_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead10.class.getSimpleName() + FREQUENCY_SUFFIX; public static final String COMPLEX_READ_OPERATION_11_FREQUENCY_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead11.class.getSimpleName() + FREQUENCY_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead11.class.getSimpleName() + FREQUENCY_SUFFIX; public static final String COMPLEX_READ_OPERATION_12_FREQUENCY_KEY = - LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead12.class.getSimpleName() + FREQUENCY_SUFFIX; + GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + ComplexRead12.class.getSimpleName() + FREQUENCY_SUFFIX; public static final List COMPLEX_READ_OPERATION_FREQUENCY_KEYS = Lists.newArrayList( COMPLEX_READ_OPERATION_1_FREQUENCY_KEY, COMPLEX_READ_OPERATION_2_FREQUENCY_KEY, @@ -350,7 +350,7 @@ public abstract class LdbcFinBenchTransactionWorkloadConfiguration { } private static String asEnableKey(Class operation) { - return LDBC_FINBENCH_TRANSACTION_PARAM_NAME_PREFIX + operation.getSimpleName() + ENABLE_SUFFIX; + return GRAPHYBENCH_TRANSACTION_PARAM_NAME_PREFIX + operation.getSimpleName() + ENABLE_SUFFIX; } public static Map convertFrequenciesToInterleaves(Map params) { @@ -396,12 +396,12 @@ public abstract class LdbcFinBenchTransactionWorkloadConfiguration { } public static Map defaultConfigSF1() throws IOException { - String filename = "/configuration/ldbc/finbench/transaction/sf_internal_test.properties"; + String filename = "/configuration/graphybench/transaction/sf_internal_test.properties"; return ConsoleAndFileDriverConfiguration.convertComplexKeysToSimpleKeys(resourceToMap(filename)); } private static Map resourceToMap(String filename) throws IOException { - try (InputStream inputStream = LdbcFinBenchTransactionWorkloadConfiguration.class.getResource(filename) + try (InputStream inputStream = GraphyBenchTransactionWorkloadConfiguration.class.getResource(filename) .openStream()) { Properties properties = new Properties(); properties.load(inputStream); diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/OperationStreamReader.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/OperationStreamReader.java similarity index 84% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/OperationStreamReader.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/OperationStreamReader.java index 2de8465d328c49bb6e2e34acff1a6331de274e09..1b4a913c36ac76e5050ab89c6e8dc98c65c2046d 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/OperationStreamReader.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/OperationStreamReader.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import java.io.File; import java.sql.SQLException; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.csv.FileLoader; -import org.ldbcouncil.finbench.driver.generator.EventStreamReader; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.csv.FileLoader; +import org.graphybench.driver.driver.generator.EventStreamReader; /** * ReadOperationStream.java diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/QueryEventStreamReader.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/QueryEventStreamReader.java similarity index 93% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/QueryEventStreamReader.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/QueryEventStreamReader.java index 0ea856df9f1056ac132fc2f47d239ddcaf8be615..54debf561bb69b796250f976908ec51e97ca6e95 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/QueryEventStreamReader.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/QueryEventStreamReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import static java.lang.String.format; @@ -25,22 +25,22 @@ import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.generator.EventStreamReader.EventDecoder; -import org.ldbcouncil.finbench.driver.truncation.TruncationOrder; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead10; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead11; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead12; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead7; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead8; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead9; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.generator.EventStreamReader.EventDecoder; +import org.graphybench.driver.driver.truncation.TruncationOrder; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead1; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead10; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead11; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead12; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead2; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead3; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead4; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead5; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead6; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead7; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead8; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead9; public class QueryEventStreamReader implements Iterator { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/RunnableOperationStreamBatchLoader.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/RunnableOperationStreamBatchLoader.java similarity index 89% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/RunnableOperationStreamBatchLoader.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/RunnableOperationStreamBatchLoader.java index 23829e5c1942ae971f56ccbed4a5dd4b0fa9484a..c26cc9f04529f2bf283d054b0c90fdc9c545a54e 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/RunnableOperationStreamBatchLoader.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/RunnableOperationStreamBatchLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import java.io.File; import java.sql.SQLException; @@ -26,12 +26,12 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.BlockingQueue; import java.util.concurrent.CountDownLatch; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.csv.FileLoader; -import org.ldbcouncil.finbench.driver.generator.EventStreamReader; -import org.ldbcouncil.finbench.driver.generator.GeneratorFactory; -import org.ldbcouncil.finbench.driver.util.Tuple2; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.csv.FileLoader; +import org.graphybench.driver.driver.generator.EventStreamReader; +import org.graphybench.driver.driver.generator.GeneratorFactory; +import org.graphybench.driver.driver.util.Tuple2; public class RunnableOperationStreamBatchLoader extends Thread { @@ -71,9 +71,9 @@ public class RunnableOperationStreamBatchLoader extends Thread { public void run() { BatchedOperationStreamReader updateOperationStream = new BatchedOperationStreamReader(loader); Map, String> classToPathMap = - LdbcFinBenchTransactionWorkloadConfiguration.getUpdateStreamClassToPathMapping(); + GraphyBenchTransactionWorkloadConfiguration.getUpdateStreamClassToPathMapping(); Map, String> classToBatchColumn = - LdbcFinBenchTransactionWorkloadConfiguration.getUpdateStreamClassToDateColumn(); + GraphyBenchTransactionWorkloadConfiguration.getUpdateStreamClassToDateColumn(); long offset = Long.MAX_VALUE; Map, Long> classToLastValue = new HashMap<>(); try { @@ -84,7 +84,7 @@ public class RunnableOperationStreamBatchLoader extends Thread { // Initialize the batch reader to set the view in DuckDB on the parquet file Tuple2 boundaries = updateOperationStream.init( new File(updatesDir, filename - + LdbcFinBenchTransactionWorkloadConfiguration.FILE_SEPARATOR + fileSuffix), + + GraphyBenchTransactionWorkloadConfiguration.FILE_SEPARATOR + fileSuffix), viewName, batchColumn ); @@ -141,7 +141,7 @@ public class RunnableOperationStreamBatchLoader extends Thread { Map, Long> classtoEndValue ) throws SQLException, WorkloadException { Map, String> classToBatchColumn = - LdbcFinBenchTransactionWorkloadConfiguration.getUpdateStreamClassToDateColumn(); + GraphyBenchTransactionWorkloadConfiguration.getUpdateStreamClassToDateColumn(); ArrayList> listOfBatchedOperationStreams = new ArrayList<>(); Map, EventStreamReader.EventDecoder> decoders = diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/UpdateEventStreamReader.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/UpdateEventStreamReader.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/UpdateEventStreamReader.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/UpdateEventStreamReader.java index 4c09a0d90ecf947de658364bac9c6ce0bf5c7d3e..0be416f7cd61c6f89593b2aada5cae6bfbe7e0c2 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/UpdateEventStreamReader.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/UpdateEventStreamReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import static java.lang.String.format; @@ -24,33 +24,33 @@ import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.generator.EventStreamReader; -import org.ldbcouncil.finbench.driver.generator.EventStreamReader.EventDecoder; -import org.ldbcouncil.finbench.driver.truncation.TruncationOrder; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ReadWrite1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ReadWrite2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ReadWrite3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write10; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write11; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write12; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write13; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write14; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write15; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write16; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write17; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write18; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write19; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write7; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write8; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write9; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.generator.EventStreamReader; +import org.graphybench.driver.driver.generator.EventStreamReader.EventDecoder; +import org.graphybench.driver.driver.truncation.TruncationOrder; +import org.graphybench.driver.driver.workloads.transaction.queries.ReadWrite1; +import org.graphybench.driver.driver.workloads.transaction.queries.ReadWrite2; +import org.graphybench.driver.driver.workloads.transaction.queries.ReadWrite3; +import org.graphybench.driver.driver.workloads.transaction.queries.Write1; +import org.graphybench.driver.driver.workloads.transaction.queries.Write10; +import org.graphybench.driver.driver.workloads.transaction.queries.Write11; +import org.graphybench.driver.driver.workloads.transaction.queries.Write12; +import org.graphybench.driver.driver.workloads.transaction.queries.Write13; +import org.graphybench.driver.driver.workloads.transaction.queries.Write14; +import org.graphybench.driver.driver.workloads.transaction.queries.Write15; +import org.graphybench.driver.driver.workloads.transaction.queries.Write16; +import org.graphybench.driver.driver.workloads.transaction.queries.Write17; +import org.graphybench.driver.driver.workloads.transaction.queries.Write18; +import org.graphybench.driver.driver.workloads.transaction.queries.Write19; +import org.graphybench.driver.driver.workloads.transaction.queries.Write2; +import org.graphybench.driver.driver.workloads.transaction.queries.Write3; +import org.graphybench.driver.driver.workloads.transaction.queries.Write4; +import org.graphybench.driver.driver.workloads.transaction.queries.Write5; +import org.graphybench.driver.driver.workloads.transaction.queries.Write6; +import org.graphybench.driver.driver.workloads.transaction.queries.Write7; +import org.graphybench.driver.driver.workloads.transaction.queries.Write8; +import org.graphybench.driver.driver.workloads.transaction.queries.Write9; /** * Decoder for the update events. There are 14 write events. diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/db/DummyLdbcFinBenchTransactionDb.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/db/DummyGraphyBenchTransactionDb.java similarity index 85% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/db/DummyLdbcFinBenchTransactionDb.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/db/DummyGraphyBenchTransactionDb.java index ac044ba07f4921f1f71a2ac0b4da673eb4cdf5fc..b5aba051f40a425380bb24d92f0c4de6d326bba9 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/db/DummyLdbcFinBenchTransactionDb.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/db/DummyGraphyBenchTransactionDb.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.db; +package org.graphybench.driver.driver.workloads.transaction.db; -public class DummyLdbcFinBenchTransactionDb { +public class DummyGraphyBenchTransactionDb { } diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead1.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead1.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead1.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead1.java index 6caeb50add1a03ab89270ee3666321002d309b70..4b54604e1f94bcf9778e31a832fdf82caca7ce39 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead1.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload complex read query 1: * -- Blocked medium related accounts -- @@ -33,10 +33,10 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.truncation.TruncationOrder; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.truncation.TruncationOrder; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead1 extends LdbcOperation> { +public class ComplexRead1 extends GraphyBenchOperation> { public static final int TYPE = 1; public static final String ID = "id"; public static final String START_TIME = "startTime"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead10.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead10.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead10.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead10.java index 031fe08c4b6c7b7b8761bd5b9534735e4c7f69ae..4c97a408baa8fded7acd284c4618c7cef0a54e70 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead10.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead10.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload complex read query 10: * -- Similarity of investor relationship -- @@ -32,9 +32,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead10 extends LdbcOperation> { +public class ComplexRead10 extends GraphyBenchOperation> { public static final int TYPE = 10; public static final String PID1 = "pid1"; public static final String PID2 = "pid2"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead10Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead10Result.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead10Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead10Result.java index c585b7b5deafcebb997735b6eae0c2fcededa948..96b2f5b86d75f88cce68caa1955b2a817bbaf198 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead10Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead10Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead11.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead11.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead11.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead11.java index ff9c564649dfbd341225c8910ce0d9bcfd9f8e33..5646f2b42ce378f7f4214fa559acd9da2f12e0b7 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead11.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead11.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload complex read query 11: * -- Guarantee Chain Detection -- @@ -32,10 +32,10 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.truncation.TruncationOrder; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.truncation.TruncationOrder; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead11 extends LdbcOperation> { +public class ComplexRead11 extends GraphyBenchOperation> { public static final int TYPE = 11; public static final String ID = "id"; public static final String START_TIME = "startTime"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead11Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead11Result.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead11Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead11Result.java index 434778eadc1745ac8835850f22828b77a3d9bcbb..578f04a9cbbece63053bb6c5141d0ccc3b623d81 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead11Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead11Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead12.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead12.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead12.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead12.java index 45cdaba85bf524bd75725d19f66876e5fc98bd10..f90414566ce1728a4e17b347573c059d88a40bb4 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead12.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead12.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload complex read query 12: * -- Transfer to company amount statistics -- @@ -32,10 +32,10 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.truncation.TruncationOrder; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.truncation.TruncationOrder; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead12 extends LdbcOperation> { +public class ComplexRead12 extends GraphyBenchOperation> { public static final int TYPE = 12; public static final String ID = "id"; public static final String START_TIME = "startTime"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead12Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead12Result.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead12Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead12Result.java index 23877e7c7b301350aa0e482b522c2ea6b779732f..5a3792296bf55720a223964d8c6b687964362d28 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead12Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead12Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead1Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead1Result.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead1Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead1Result.java index e6bc0cce309f8be3611b8fef2f362cf59d639047..d1c8a51cda94ac89f364d6344d832e9b600a2673 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead1Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead1Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead2.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead2.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead2.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead2.java index 844690367d7ce212293ce3c2489831170b901f3e..5840a2514f182608a4986b9de411416efdf93d13 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead2.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload complex read query 2: * -- Fund gathered from the accounts applying loans -- @@ -34,10 +34,10 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.truncation.TruncationOrder; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.truncation.TruncationOrder; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead2 extends LdbcOperation> { +public class ComplexRead2 extends GraphyBenchOperation> { public static final int TYPE = 2; public static final String ID = "id"; public static final String START_TIME = "startTime"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead2Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead2Result.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead2Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead2Result.java index 876d7ecdb3d5454f7436801a35dab850bf9bec8f..3da58c36adaaf3c8980aa2006238621eb43cfc46 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead2Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead2Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead3.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead3.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead3.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead3.java index 1a18f614e869a197e2dd7df5534a83ec8673962a..153bc13e6c5f990b75aa02ebd77afcf127476754 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead3.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead3.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload complex read query 3: * -- Shortest transfer path -- @@ -33,9 +33,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead3 extends LdbcOperation> { +public class ComplexRead3 extends GraphyBenchOperation> { public static final int TYPE = 3; public static final String ID1 = "id1"; public static final String ID2 = "id2"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead3Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead3Result.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead3Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead3Result.java index a27c480ae57b298a1e63ed7d9723bb028000aa6a..cbae1f7e73d15d13f32f97235ac3fb3bd3e537be 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead3Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead3Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead4.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead4.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead4.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead4.java index 8971d8afbdf3bdd5f6fa24feae158f7ca2bd3edc..f2bd8d80a79ed4bd7d4159a430c918ef3a52acae 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead4.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead4.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload complex read query 4: * -- Three accounts in a transfer cycle -- @@ -35,9 +35,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead4 extends LdbcOperation> { +public class ComplexRead4 extends GraphyBenchOperation> { public static final int TYPE = 4; public static final String ID1 = "id1"; public static final String ID2 = "id2"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead4Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead4Result.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead4Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead4Result.java index 83023a105f58f956fabcd1cea703565816cbb688..d7d3f3a739b85c6aae300b6dd2f21f59f209b982 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead4Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead4Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead5.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead5.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead5.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead5.java index c11eea02f3efa9d4547c673c0684d9c42252eac7..c1904a9b99994fdcf8fed0508dda0f31e0015f59 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead5.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead5.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload complex read query 5: * -- Exact Account Transfer Trace -- @@ -35,10 +35,10 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.truncation.TruncationOrder; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.truncation.TruncationOrder; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead5 extends LdbcOperation> { +public class ComplexRead5 extends GraphyBenchOperation> { public static final int TYPE = 5; public static final String ID = "id"; public static final String START_TIME = "startTime"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead5Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead5Result.java similarity index 92% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead5Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead5Result.java index 0177255ad122fe7038d079f859692e0505be36c9..65c6ca35f76730703ad631741b2e4a1fd17b34dd 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead5Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead5Result.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; -import org.ldbcouncil.finbench.driver.result.Path; +import org.graphybench.driver.driver.result.Path; public class ComplexRead5Result { public static final String PATH = "path"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead6.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead6.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead6.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead6.java index c9f4c4cbda4157bfc6a2cc190d32bd60489a8aa6..ac23a53584460f218092c9a4aba29bf7fdd0bee6 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead6.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead6.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload complex read query 6: * -- Withdrawal after Many-to-One transfer -- @@ -34,10 +34,10 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.truncation.TruncationOrder; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.truncation.TruncationOrder; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead6 extends LdbcOperation> { +public class ComplexRead6 extends GraphyBenchOperation> { public static final int TYPE = 6; public static final String ID = "id"; public static final String THRESHOLD1 = "threshold1"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead6Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead6Result.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead6Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead6Result.java index b7a0e4973e2525dd21f8cc61696282a7c96e2a59..65523ba57d472802ae1323e46f3d6668d4a53865 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead6Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead6Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead7.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead7.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead7.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead7.java index e702bd51b5994453d93c8716ecb9471c5e8cd661..4e5e0c7fd51e37c809cd513878a4a73cd99f0e41 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead7.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead7.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload complex read query 7: * -- Fast-in and Fast-out -- @@ -33,10 +33,10 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.truncation.TruncationOrder; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.truncation.TruncationOrder; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead7 extends LdbcOperation> { +public class ComplexRead7 extends GraphyBenchOperation> { public static final int TYPE = 7; public static final String ID = "id"; public static final String THRESHOLD = "threshold"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead7Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead7Result.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead7Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead7Result.java index 700a910167f824bd7690aaf1e80382ae9c77ac2d..bab1c599e550c55b10ea5e0460b81f936acd414c 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead7Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead7Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead8.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead8.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead8.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead8.java index 2d4eb93993f4eb971e7623010e259c774b3fc83d..daa5c51d1412c5c455c4fadd224dbf8cae90ef81 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead8.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead8.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload complex read query 8: * -- Transfer trace after loan applied -- @@ -37,10 +37,10 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.truncation.TruncationOrder; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.truncation.TruncationOrder; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead8 extends LdbcOperation> { +public class ComplexRead8 extends GraphyBenchOperation> { public static final int TYPE = 8; public static final String ID = "id"; public static final String THRESHOLD = "threshold"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead8Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead8Result.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead8Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead8Result.java index b46b53338f946a5a25b85f78ad70a339a1e59c10..edd466b3a275167d76aef07c91fc075df54da0bc 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead8Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead8Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead9.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead9.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead9.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead9.java index 53eb90249804172975950a5eb8b97daae803b4d9..f4c65835d1dfb875ba1ac0c253c17b1cabbfa467 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead9.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead9.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload complex read query 9: * -- Money laundering with loan involved -- @@ -34,10 +34,10 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.truncation.TruncationOrder; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.truncation.TruncationOrder; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead9 extends LdbcOperation> { +public class ComplexRead9 extends GraphyBenchOperation> { public static final int TYPE = 9; public static final String ID = "id"; public static final String THRESHOLD = "threshold"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead9Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead9Result.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead9Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead9Result.java index 223ec8aee88324822f331066f9a7a106e05369f5..1eb065ea57db033f301ff28c631656e2aff5ac8d 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead9Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead9Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ReadWrite1.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite1.java similarity index 91% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ReadWrite1.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite1.java index 98add7ab49e1cab7f46443be5f044d435b6afa74..7cb9058f21328ba0d677f36ae7093ffcdf890674 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ReadWrite1.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload read write query 1: * -- Transfer under transfer cycle detection strategy -- @@ -34,10 +34,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ReadWrite1 extends LdbcOperation { +public class ReadWrite1 extends GraphyBenchOperation { public static final int TYPE = 10001; public static final String SRC_ID = "srcId"; public static final String DST_ID = "dstId"; @@ -122,8 +122,8 @@ public class ReadWrite1 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ReadWrite2.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite2.java similarity index 93% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ReadWrite2.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite2.java index ed29f2956810dc3745a3f2a3c247831173ec5201..9e482f7f456c9d5f967b2d138a7123e7a9feedb7 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ReadWrite2.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload read write query 2: * -- Transfer under in/out ratio strategy -- @@ -35,11 +35,11 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.truncation.TruncationOrder; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.truncation.TruncationOrder; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ReadWrite2 extends LdbcOperation { +public class ReadWrite2 extends GraphyBenchOperation { public static final int TYPE = 10002; public static final String SRC_ID = "srcId"; public static final String DST_ID = "dstId"; @@ -164,8 +164,8 @@ public class ReadWrite2 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ReadWrite3.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite3.java similarity index 92% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ReadWrite3.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite3.java index 5f40870f34e64198856b1ffed35c839173a0d214..44a6773779a0fa90ce65f3023fa2dae6e6c0c5e4 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ReadWrite3.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite3.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload read write query 3: * -- Guarantee under guarantee chain detection strategy -- @@ -36,11 +36,11 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.truncation.TruncationOrder; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.truncation.TruncationOrder; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ReadWrite3 extends LdbcOperation { +public class ReadWrite3 extends GraphyBenchOperation { public static final int TYPE = 10003; public static final String SRC_ID = "srcId"; public static final String DST_ID = "dstId"; @@ -145,8 +145,8 @@ public class ReadWrite3 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead1.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead1.java similarity index 93% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead1.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead1.java index 5854a623d23cf0e604e4c201844fa7e7902b87d0..40b9272d10e3061f09eb09318297c5daec0734af 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead1.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload simple read query 1: * -- Exact account query -- @@ -30,9 +30,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class SimpleRead1 extends LdbcOperation> { +public class SimpleRead1 extends GraphyBenchOperation> { public static final int TYPE = 101; public static final String ID = "id"; public static final String START_TIME = "startTime"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead1Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead1Result.java similarity index 97% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead1Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead1Result.java index 19956c2946c2b20b3dd4b996bfc59a5138a4a9ff..6c6c5cbbd2bd075ac306fa90d47ebcabd90aec5e 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead1Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead1Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Date; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead2.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead2.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead2.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead2.java index 385b3a25e144eb77050d5d8d80987cea7fb8b7a3..f0d5fc5040ddba0a6a0ac4699579a9ab1385cace 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead2.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload simple read query 2: * -- Transfer-ins and transfer-outs -- @@ -33,9 +33,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class SimpleRead2 extends LdbcOperation> { +public class SimpleRead2 extends GraphyBenchOperation> { public static final int TYPE = 102; public static final String ID = "id"; public static final String START_TIME = "startTime"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead2Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead2Result.java similarity index 98% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead2Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead2Result.java index 33a393e22d093f78379c4d5d06fe3dece0afed0a..12448b11cc649db33ebb7c5dfca640e1e30b427a 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead2Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead2Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead3.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead3.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead3.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead3.java index 087ef32a2a1b326f630cf80cc906391031633cbf..c3e7b5d5eae8b7882c073d633bd872744a36f83c 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead3.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead3.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload simple read query 3: * -- Many-to-one blocked account monitoring -- @@ -32,9 +32,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class SimpleRead3 extends LdbcOperation> { +public class SimpleRead3 extends GraphyBenchOperation> { public static final int TYPE = 103; public static final String ID = "id"; public static final String THRESHOLD = "threshold"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead3Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead3Result.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead3Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead3Result.java index 57a434766e70b816312daf2f766017459edad6d6..4da505df9a4718e7374afc154c0ff9fcf549842b 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead3Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead3Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead4.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead4.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead4.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead4.java index 50dfbabc650af7ae19ccc1bb399ae8c5f6669930..7f24ad6a0b4a83c5672f943635f013aa65ee3c81 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead4.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead4.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload simple read query 4: * -- Account transfer-outs over threshold -- @@ -32,9 +32,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class SimpleRead4 extends LdbcOperation> { +public class SimpleRead4 extends GraphyBenchOperation> { public static final int TYPE = 104; public static final String ID = "id"; public static final String THRESHOLD = "threshold"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead4Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead4Result.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead4Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead4Result.java index a5022dae0e2883385ae4e4a4c79b5c4757e606f4..26de3e7cf43026cbb1dfc414149fe09339d286d8 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead4Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead4Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead5.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead5.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead5.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead5.java index 52e4830ffd68bc0ece6821f8f14f65d50aaf8b2b..2132b3b2de767387871f6cf5e2faefe385d7c463 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead5.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead5.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload simple read query 5: * -- Account transfer-ins over threshold -- @@ -32,9 +32,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class SimpleRead5 extends LdbcOperation> { +public class SimpleRead5 extends GraphyBenchOperation> { public static final int TYPE = 105; public static final String ID = "id"; public static final String THRESHOLD = "threshold"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead5Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead5Result.java similarity index 96% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead5Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead5Result.java index dda186f4f59c88dc41ab45e33e17fa9d5fb5eaee..cd713c5796622f4a50c34ee9a274e32dec847a82 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead5Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead5Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead6.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead6.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead6.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead6.java index 65f6e39f7ac7cae5a7670339ffb4331265ae9d69..4afe57886eef5e839339d98c2b015c9992e71db1 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead6.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead6.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload simple read query 6: * -- Accounts with the same transfer sources of exact account -- @@ -31,9 +31,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class SimpleRead6 extends LdbcOperation> { +public class SimpleRead6 extends GraphyBenchOperation> { public static final int TYPE = 106; public static final String ID = "id"; public static final String START_TIME = "startTime"; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead6Result.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead6Result.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead6Result.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead6Result.java index 5ee6c2efbac63c55c0aa561e2f4de2a1708a0b4a..710d4c5c607edd4eb870636af1470013c212f8e3 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/SimpleRead6Result.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead6Result.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Objects; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write1.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write1.java similarity index 90% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write1.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write1.java index adb6eb970fdda7cf901a9eee1b541bf59f010ace..aa6008ff46a0ee2871fd394088bb69c7d2e1b92a 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write1.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 1: * -- Add a Person Node -- @@ -25,10 +25,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write1 extends LdbcOperation { +public class Write1 extends GraphyBenchOperation { public static final int TYPE = 1001; public static final String PERSON_ID = "personId"; public static final String PERSON_NAME = "personName"; @@ -103,8 +103,8 @@ public class Write1 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write10.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write10.java similarity index 89% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write10.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write10.java index 8a0d716581cd727504f9f5d0d0d53ae5108715bc..4e854a80394df456ca9ac9c8cf82002f75c2fbe0 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write10.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write10.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 10: * -- Add Guarantee Between Persons -- @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write10 extends LdbcOperation { +public class Write10 extends GraphyBenchOperation { public static final int TYPE = 1010; public static final String PERSON_ID1 = "personId1"; public static final String PERSON_ID2 = "personId2"; @@ -94,8 +94,8 @@ public class Write10 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write11.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write11.java similarity index 89% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write11.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write11.java index cca760dc7b18110f887de8514bee8891b57a4ab6..e303398572766b69a0bc296aa6101a84819ef63b 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write11.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write11.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 11: * -- Add Guarantee Between Companies -- @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write11 extends LdbcOperation { +public class Write11 extends GraphyBenchOperation { public static final int TYPE = 1011; public static final String COMPANY_ID1 = "companyId1"; public static final String COMPANY_ID2 = "companyId2"; @@ -94,8 +94,8 @@ public class Write11 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write12.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write12.java similarity index 91% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write12.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write12.java index 3c1bb31d80e3455902960a30a518e81116cf934e..e578fd0c21b4f63a875654db0e99f0f2785aaa0d 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write12.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write12.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 12: * -- Add Transfer Between Accounts -- @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write12 extends LdbcOperation { +public class Write12 extends GraphyBenchOperation { public static final int TYPE = 1012; public static final String ACCOUNT_ID1 = "accountId1"; public static final String ACCOUNT_ID2 = "accountId2"; @@ -114,8 +114,8 @@ public class Write12 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write13.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write13.java similarity index 90% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write13.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write13.java index ff3eaa5363abd9fcdb2c9d8dcccfdebe60bdab78..262080be973442d227eeaf104c2c2bff4bbb7ccf 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write13.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write13.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 13: * -- Add Withdraw Between Accounts -- @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write13 extends LdbcOperation { +public class Write13 extends GraphyBenchOperation { public static final int TYPE = 1013; public static final String ACCOUNT_ID1 = "accountId1"; public static final String ACCOUNT_ID2 = "accountId2"; @@ -109,8 +109,8 @@ public class Write13 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write14.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write14.java similarity index 89% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write14.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write14.java index 243a03e50b343e9b276b240f93f01b4dce6ffb28..85d01c24d36e4dd82ffdecdd1ff76fd77dbd8d1f 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write14.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write14.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 14: * -- Add Repay Between Account And Loan -- @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write14 extends LdbcOperation { +public class Write14 extends GraphyBenchOperation { public static final int TYPE = 1014; public static final String ACCOUNT_ID = "accountId"; public static final String LOAN_ID = "loanId"; @@ -99,8 +99,8 @@ public class Write14 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write15.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write15.java similarity index 89% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write15.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write15.java index 0699d3b6c4285f62bef2668d789fef5c5f53d9f0..db4b5bffc5995d2a6bd073c82bc16af0725874fe 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write15.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write15.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 15: * -- Add Deposit Between Loan And Account -- @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write15 extends LdbcOperation { +public class Write15 extends GraphyBenchOperation { public static final int TYPE = 1015; public static final String LOAN_ID = "loanId"; public static final String ACCOUNT_ID = "accountId"; @@ -99,8 +99,8 @@ public class Write15 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write16.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write16.java similarity index 89% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write16.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write16.java index 23831e0ae4d45fe5d4ce3d6daf8b06d23bdf6cc3..1015e3c5f04d4d0f357be652625f268088b930a8 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write16.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write16.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 16: * -- Account signed in with Medium -- @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write16 extends LdbcOperation { +public class Write16 extends GraphyBenchOperation { public static final int TYPE = 1016; public static final String MEDIUM_ID = "mediumId"; public static final String ACCOUNT_ID = "accountId"; @@ -94,8 +94,8 @@ public class Write16 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write17.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write17.java similarity index 84% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write17.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write17.java index 5ff7852ce014dce167e2011f7aed08fb2ca26a85..766324c295716eb05d94e1e0f765e368e9cf7692 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write17.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write17.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 17: * -- Remove an Account -- @@ -27,10 +27,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write17 extends LdbcOperation { +public class Write17 extends GraphyBenchOperation { public static final int TYPE = 1017; public static final String ACCOUNT_ID = "accountId"; private final long accountId; @@ -65,8 +65,8 @@ public class Write17 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write18.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write18.java similarity index 83% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write18.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write18.java index 9aeff0a9d77542dfa1c524b6056b839a650ed59a..69dddb0fb7f017c3602252f95a237b03f05b4f55 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write18.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write18.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 18: * -- Block a Account of high risk -- @@ -25,10 +25,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write18 extends LdbcOperation { +public class Write18 extends GraphyBenchOperation { public static final int TYPE = 1018; public static final String ACCOUNT_ID = "accountId"; private final long accountId; @@ -63,8 +63,8 @@ public class Write18 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write19.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write19.java similarity index 83% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write19.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write19.java index a24e9efe81b0fedaba8edbf6afecbcfc596339bf..1dd71f0e6522666d379250162c6a29209cecf74f 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write19.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write19.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 19: * -- Block a Person of high risk -- @@ -25,10 +25,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write19 extends LdbcOperation { +public class Write19 extends GraphyBenchOperation { public static final int TYPE = 1019; public static final String PERSON_ID = "personId"; private final long personId; @@ -63,8 +63,8 @@ public class Write19 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write2.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write2.java similarity index 90% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write2.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write2.java index 9eff58273eb9a9ec1d73876df1c1c3011c731c9f..d1cb331092472aa3597159cfec9e498465238b71 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write2.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 2: * -- Add a Company Node -- @@ -25,10 +25,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write2 extends LdbcOperation { +public class Write2 extends GraphyBenchOperation { public static final int TYPE = 1002; public static final String COMPANY_ID = "companyId"; public static final String COMPANY_NAME = "companyName"; @@ -108,8 +108,8 @@ public class Write2 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write3.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write3.java similarity index 89% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write3.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write3.java index 47b558379c10c9d8467f128acd5441e99ec82a33..156aafc49c571fce19b96db912c6f3b882bf70d5 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write3.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write3.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 3: * -- Add a Medium Node -- @@ -25,10 +25,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableMap; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write3 extends LdbcOperation { +public class Write3 extends GraphyBenchOperation { public static final int TYPE = 1003; public static final String MEDIUM_ID = "mediumId"; public static final String MEDIUM_TYPE = "mediumType"; @@ -93,8 +93,8 @@ public class Write3 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write4.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write4.java similarity index 93% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write4.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write4.java index 9439a1008ac50413c777b29ff2d4c512af875944..67e6c0fe38d392d66bab38d2d0e4aad75943645b 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write4.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write4.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 4: * -- Add an Account Node owned by Person -- @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write4 extends LdbcOperation { +public class Write4 extends GraphyBenchOperation { public static final int TYPE = 1004; public static final String PERSON_ID = "personId"; public static final String ACCOUNT_ID = "accountId"; @@ -139,8 +139,8 @@ public class Write4 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write5.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write5.java similarity index 93% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write5.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write5.java index c55b844a98329935654b33cba5c83f1921ca231f..9cbc83fd37428fc7c3d91ea6e63c033e67e30849 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write5.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write5.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 5: * -- Add an Account Node owned by Company -- @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write5 extends LdbcOperation { +public class Write5 extends GraphyBenchOperation { public static final int TYPE = 1005; public static final String COMPANY_ID = "companyId"; public static final String ACCOUNT_ID = "accountId"; @@ -139,8 +139,8 @@ public class Write5 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write6.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write6.java similarity index 91% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write6.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write6.java index a794c1b97c47be33620bc148119b71229838f8a1..1cd212151aa689b23f1d0312a046ac1886dc52b6 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write6.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write6.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 6: * -- Add Loan applied by Person -- @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write6 extends LdbcOperation { +public class Write6 extends GraphyBenchOperation { public static final int TYPE = 1006; public static final String PERSON_ID = "personId"; public static final String LOAN_ID = "loanId"; @@ -124,8 +124,8 @@ public class Write6 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write7.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write7.java similarity index 91% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write7.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write7.java index f101b81b91958525662e50f0432bea34e74c0616..3964a3a862822924705091e2a1a2a18ae8652374 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write7.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write7.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 7: * -- Account signed in with Medium -- @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write7 extends LdbcOperation { +public class Write7 extends GraphyBenchOperation { public static final int TYPE = 1007; public static final String COMPANY_ID = "companyId"; public static final String LOAN_ID = "loanId"; @@ -124,8 +124,8 @@ public class Write7 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write8.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write8.java similarity index 89% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write8.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write8.java index 094df487a585078dfd6151b5abc2d59d8e0e3c1a..1543443b6a65a5a3cd50c8de7127fcd1a019a406 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write8.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write8.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 8: * -- Add Invest Between Person And Company -- @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write8 extends LdbcOperation { +public class Write8 extends GraphyBenchOperation { public static final int TYPE = 1008; public static final String PERSON_ID = "personId"; public static final String COMPANY_ID = "companyId"; @@ -99,8 +99,8 @@ public class Write8 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write9.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write9.java similarity index 89% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write9.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write9.java index d1344664f57ba7205a30263e4c3a07ca0922af7f..60bd8fe326378d721e17fb704d114dd35717289f 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/queries/Write9.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write9.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction.queries; +package org.graphybench.driver.driver.workloads.transaction.queries; /* * Transaction workload write query 9: * -- Add Invest Between Company And Company -- @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write9 extends LdbcOperation { +public class Write9 extends GraphyBenchOperation { public static final int TYPE = 1009; public static final String COMPANY_ID1 = "companyId1"; public static final String COMPANY_ID2 = "companyId2"; @@ -99,8 +99,8 @@ public class Write9 extends LdbcOperation { } @Override - public LdbcNoResult deserializeResult(String serializedResults) { - return LdbcNoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/ldbcouncil/finbench/impls/dummy/DummyDb.java b/src/main/java/org/graphybench/driver/impls/dummy/DummyDb.java similarity index 81% rename from src/main/java/org/ldbcouncil/finbench/impls/dummy/DummyDb.java rename to src/main/java/org/graphybench/driver/impls/dummy/DummyDb.java index d719ff27d7ceaf6fb135438b4557da13439400bb..41fa7fcd56dd81578dd61502ea0ff0e02033462a 100644 --- a/src/main/java/org/ldbcouncil/finbench/impls/dummy/DummyDb.java +++ b/src/main/java/org/graphybench/driver/impls/dummy/DummyDb.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.impls.dummy; +package org.graphybench.driver.impls.dummy; import java.io.IOException; import java.util.ArrayList; @@ -24,67 +24,67 @@ import java.util.List; import java.util.Map; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.ldbcouncil.finbench.driver.Db; -import org.ldbcouncil.finbench.driver.DbConnectionState; -import org.ldbcouncil.finbench.driver.DbException; -import org.ldbcouncil.finbench.driver.OperationHandler; -import org.ldbcouncil.finbench.driver.ResultReporter; -import org.ldbcouncil.finbench.driver.log.LoggingService; -import org.ldbcouncil.finbench.driver.result.Path; -import org.ldbcouncil.finbench.driver.workloads.transaction.LdbcNoResult; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead10; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead10Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead11; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead11Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead12; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead12Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead1Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead2Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead3Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead4Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead5Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead6Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead7; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead7Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead8; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead8Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead9; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead9Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ReadWrite1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ReadWrite2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ReadWrite3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead1Result; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.SimpleRead6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write10; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write11; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write12; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write13; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write14; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write15; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write16; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write17; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write18; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write19; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write2; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write3; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write4; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write6; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write7; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write8; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write9; +import org.graphybench.driver.driver.Db; +import org.graphybench.driver.driver.DbConnectionState; +import org.graphybench.driver.driver.DbException; +import org.graphybench.driver.driver.OperationHandler; +import org.graphybench.driver.driver.ResultReporter; +import org.graphybench.driver.driver.log.LoggingService; +import org.graphybench.driver.driver.result.Path; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead1; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead10; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead10Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead11; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead11Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead12; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead12Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead1Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead2; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead2Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead3; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead3Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead4; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead4Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead5; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead5Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead6; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead6Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead7; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead7Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead8; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead8Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead9; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead9Result; +import org.graphybench.driver.driver.workloads.transaction.queries.ReadWrite1; +import org.graphybench.driver.driver.workloads.transaction.queries.ReadWrite2; +import org.graphybench.driver.driver.workloads.transaction.queries.ReadWrite3; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead1; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead1Result; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead2; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead3; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead4; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead5; +import org.graphybench.driver.driver.workloads.transaction.queries.SimpleRead6; +import org.graphybench.driver.driver.workloads.transaction.queries.Write1; +import org.graphybench.driver.driver.workloads.transaction.queries.Write10; +import org.graphybench.driver.driver.workloads.transaction.queries.Write11; +import org.graphybench.driver.driver.workloads.transaction.queries.Write12; +import org.graphybench.driver.driver.workloads.transaction.queries.Write13; +import org.graphybench.driver.driver.workloads.transaction.queries.Write14; +import org.graphybench.driver.driver.workloads.transaction.queries.Write15; +import org.graphybench.driver.driver.workloads.transaction.queries.Write16; +import org.graphybench.driver.driver.workloads.transaction.queries.Write17; +import org.graphybench.driver.driver.workloads.transaction.queries.Write18; +import org.graphybench.driver.driver.workloads.transaction.queries.Write19; +import org.graphybench.driver.driver.workloads.transaction.queries.Write2; +import org.graphybench.driver.driver.workloads.transaction.queries.Write3; +import org.graphybench.driver.driver.workloads.transaction.queries.Write4; +import org.graphybench.driver.driver.workloads.transaction.queries.Write5; +import org.graphybench.driver.driver.workloads.transaction.queries.Write6; +import org.graphybench.driver.driver.workloads.transaction.queries.Write7; +import org.graphybench.driver.driver.workloads.transaction.queries.Write8; +import org.graphybench.driver.driver.workloads.transaction.queries.Write9; public class DummyDb extends Db { static Logger logger = LogManager.getLogger("DummyDb"); @@ -406,7 +406,7 @@ public class DummyDb extends Db { public void executeOperation(Write1 w1, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w1.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w1); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w1); } } @@ -415,7 +415,7 @@ public class DummyDb extends Db { public void executeOperation(Write2 w2, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w2.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w2); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w2); } } @@ -424,7 +424,7 @@ public class DummyDb extends Db { public void executeOperation(Write3 w3, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w3.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w3); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w3); } } @@ -433,7 +433,7 @@ public class DummyDb extends Db { public void executeOperation(Write4 w4, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w4.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w4); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w4); } } @@ -442,7 +442,7 @@ public class DummyDb extends Db { public void executeOperation(Write5 w5, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w5.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w5); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w5); } } @@ -451,7 +451,7 @@ public class DummyDb extends Db { public void executeOperation(Write6 w6, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w6.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w6); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w6); } } @@ -460,7 +460,7 @@ public class DummyDb extends Db { public void executeOperation(Write7 w7, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w7.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w7); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w7); } } @@ -469,7 +469,7 @@ public class DummyDb extends Db { public void executeOperation(Write8 w8, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w8.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w8); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w8); } } @@ -478,7 +478,7 @@ public class DummyDb extends Db { public void executeOperation(Write9 w9, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w9.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w9); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w9); } } @@ -487,7 +487,7 @@ public class DummyDb extends Db { public void executeOperation(Write10 w10, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w10.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w10); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w10); } } @@ -496,7 +496,7 @@ public class DummyDb extends Db { public void executeOperation(Write11 w11, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w11.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w11); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w11); } } @@ -505,7 +505,7 @@ public class DummyDb extends Db { public void executeOperation(Write12 w12, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w12.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w12); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w12); } } @@ -514,7 +514,7 @@ public class DummyDb extends Db { public void executeOperation(Write13 w13, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w13.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w13); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w13); } } @@ -523,7 +523,7 @@ public class DummyDb extends Db { public void executeOperation(Write14 w14, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w14.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w14); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w14); } } @@ -532,7 +532,7 @@ public class DummyDb extends Db { public void executeOperation(Write15 w15, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w15.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w15); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w15); } } @@ -541,7 +541,7 @@ public class DummyDb extends Db { public void executeOperation(Write16 w16, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w16.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w16); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w16); } } @@ -550,7 +550,7 @@ public class DummyDb extends Db { public void executeOperation(Write17 w17, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w17.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w17); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w17); } } @@ -559,7 +559,7 @@ public class DummyDb extends Db { public void executeOperation(Write18 w18, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w18.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w18); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w18); } } @@ -568,7 +568,7 @@ public class DummyDb extends Db { public void executeOperation(Write19 w19, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(w19.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, w19); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, w19); } } @@ -577,7 +577,7 @@ public class DummyDb extends Db { public void executeOperation(ReadWrite1 rw1, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(rw1.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, rw1); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, rw1); } } @@ -586,7 +586,7 @@ public class DummyDb extends Db { public void executeOperation(ReadWrite2 rw2, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { - resultReporter.report(0, LdbcNoResult.INSTANCE, rw2); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, rw2); } } @@ -595,7 +595,7 @@ public class DummyDb extends Db { public void executeOperation(ReadWrite3 rw3, DummyDbConnectionState dummyDbConnectionState, ResultReporter resultReporter) throws DbException { DummyDb.logger.info(rw3.toString()); - resultReporter.report(0, LdbcNoResult.INSTANCE, rw3); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, rw3); } } } diff --git a/src/main/java/org/ldbcouncil/finbench/impls/dummy/DummyDbConnectionState.java b/src/main/java/org/graphybench/driver/impls/dummy/DummyDbConnectionState.java similarity index 89% rename from src/main/java/org/ldbcouncil/finbench/impls/dummy/DummyDbConnectionState.java rename to src/main/java/org/graphybench/driver/impls/dummy/DummyDbConnectionState.java index 6c1951da78e9a386c1ae9ccd56cfde664485e39e..758a2363a79bc4f7941554c7c17a4ae7162e9d1e 100644 --- a/src/main/java/org/ldbcouncil/finbench/impls/dummy/DummyDbConnectionState.java +++ b/src/main/java/org/graphybench/driver/impls/dummy/DummyDbConnectionState.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.impls.dummy; +package org.graphybench.driver.impls.dummy; import java.io.IOException; -import org.ldbcouncil.finbench.driver.DbConnectionState; +import org.graphybench.driver.driver.DbConnectionState; public class DummyDbConnectionState extends DbConnectionState { diff --git a/src/main/resources/configuration/graphybench/transaction/sf1.properties b/src/main/resources/configuration/graphybench/transaction/sf1.properties new file mode 100644 index 0000000000000000000000000000000000000000..41898f2a6a7ced7759077e58e89fb47a782a481d --- /dev/null +++ b/src/main/resources/configuration/graphybench/transaction/sf1.properties @@ -0,0 +1,16 @@ +graphybench.interactive.update_interleave=1619 + +# Frequency of complex read queries +graphybench.transaction.queries.ComplexRead1_freq=26 +graphybench.transaction.queries.ComplexRead2_freq=37 +graphybench.transaction.queries.ComplexRead3_freq=106 +graphybench.transaction.queries.ComplexRead4_freq=36 +graphybench.transaction.queries.ComplexRead5_freq=72 +graphybench.transaction.queries.ComplexRead6_freq=316 +graphybench.transaction.queries.ComplexRead7_freq=48 +graphybench.transaction.queries.ComplexRead8_freq=9 +graphybench.transaction.queries.ComplexRead9_freq=384 +graphybench.transaction.queries.ComplexRead10_freq=37 +graphybench.transaction.queries.ComplexRead11_freq=20 +graphybench.transaction.queries.ComplexRead12_freq=44 +graphybench.transaction.queries.ComplexRead13_freq=19 diff --git a/src/main/resources/configuration/graphybench/transaction/sf_internal_test.properties b/src/main/resources/configuration/graphybench/transaction/sf_internal_test.properties new file mode 100644 index 0000000000000000000000000000000000000000..9a1db797e937d3194529babcf2fa29d2fc2ba3af --- /dev/null +++ b/src/main/resources/configuration/graphybench/transaction/sf_internal_test.properties @@ -0,0 +1,65 @@ +workload=org.graphybench.driver.driver.workloads.transaction.GraphyBenchTransactionWorkload +db=org.graphybench.driver.impls.dummy.DummyDb +operation_count=10 +# Short reads random walk dissipation rate, in the interval [1.0-0.0] +# Higher values translate to shorter walks and therefore fewer short reads +graphybench.transaction.queries.simple_read_dissipation=0.2 +graphybench.transaction.queries.scale_factor=1 +# params dir +graphybench.transaction.queries.parameters_dir=src/main/resources/example/data/read_params +graphybench.transaction.queries.updates_dir=src/main/resources/example/data/incremental_data +# Frequency of complex read queries +graphybench.transaction.queries.ComplexRead1_freq=26 +graphybench.transaction.queries.ComplexRead2_freq=37 +graphybench.transaction.queries.ComplexRead3_freq=106 +graphybench.transaction.queries.ComplexRead4_freq=36 +graphybench.transaction.queries.ComplexRead5_freq=72 +graphybench.transaction.queries.ComplexRead6_freq=316 +graphybench.transaction.queries.ComplexRead7_freq=48 +graphybench.transaction.queries.ComplexRead8_freq=9 +graphybench.transaction.queries.ComplexRead9_freq=384 +graphybench.transaction.queries.ComplexRead10_freq=37 +graphybench.transaction.queries.ComplexRead11_freq=20 +graphybench.transaction.queries.ComplexRead12_freq=44 +graphybench.transaction.queries.ComplexRead13_freq=19 +# For debugging purposes +graphybench.transaction.queries.ComplexRead1_enable=true +graphybench.transaction.queries.ComplexRead2_enable=true +graphybench.transaction.queries.ComplexRead3_enable=true +graphybench.transaction.queries.ComplexRead4_enable=true +graphybench.transaction.queries.ComplexRead5_enable=true +graphybench.transaction.queries.ComplexRead6_enable=true +graphybench.transaction.queries.ComplexRead7_enable=true +graphybench.transaction.queries.ComplexRead8_enable=true +graphybench.transaction.queries.ComplexRead9_enable=true +graphybench.transaction.queries.ComplexRead10_enable=true +graphybench.transaction.queries.ComplexRead11_enable=true +graphybench.transaction.queries.ComplexRead12_enable=true +graphybench.transaction.queries.ComplexRead13_enable=true +graphybench.transaction.queries.SimpleRead1_enable=true +graphybench.transaction.queries.SimpleRead2_enable=true +graphybench.transaction.queries.SimpleRead3_enable=true +graphybench.transaction.queries.SimpleRead4_enable=true +graphybench.transaction.queries.SimpleRead5_enable=true +graphybench.transaction.queries.SimpleRead6_enable=true +graphybench.transaction.queries.SimpleRead7_enable=true +graphybench.transaction.queries.SimpleRead8_enable=true +graphybench.transaction.queries.Write1_enable=true +graphybench.transaction.queries.Write2_enable=true +graphybench.transaction.queries.Write3_enable=true +graphybench.transaction.queries.Write4_enable=true +graphybench.transaction.queries.Write5_enable=true +graphybench.transaction.queries.Write6_enable=true +graphybench.transaction.queries.Write7_enable=true +graphybench.transaction.queries.Write8_enable=true +graphybench.transaction.queries.Write9_enable=true +graphybench.transaction.queries.Write10_enable=true +graphybench.transaction.queries.Write11_enable=true +graphybench.transaction.queries.Write12_enable=true +graphybench.transaction.queries.Write13_enable=true +graphybench.transaction.queries.Write14_enable=true +graphybench.transaction.queries.ReadWrite1_enable=true +graphybench.transaction.queries.ReadWrite2_enable=true +graphybench.transaction.queries.ReadWrite3_enable=true +graphybench.transaction.queries.ReadWrite4_enable=true +graphybench.transaction.queries.ReadWrite5_enable=true \ No newline at end of file diff --git a/src/main/resources/configuration/ldbc/finbench/transaction/sf1.properties b/src/main/resources/configuration/ldbc/finbench/transaction/sf1.properties deleted file mode 100644 index 0153ac2a30546ad0d1454a7af760b0ca7fe2e89b..0000000000000000000000000000000000000000 --- a/src/main/resources/configuration/ldbc/finbench/transaction/sf1.properties +++ /dev/null @@ -1,16 +0,0 @@ -ldbc.finbench.interactive.update_interleave=1619 - -# Frequency of complex read queries -ldbc.finbench.transaction.queries.ComplexRead1_freq=26 -ldbc.finbench.transaction.queries.ComplexRead2_freq=37 -ldbc.finbench.transaction.queries.ComplexRead3_freq=106 -ldbc.finbench.transaction.queries.ComplexRead4_freq=36 -ldbc.finbench.transaction.queries.ComplexRead5_freq=72 -ldbc.finbench.transaction.queries.ComplexRead6_freq=316 -ldbc.finbench.transaction.queries.ComplexRead7_freq=48 -ldbc.finbench.transaction.queries.ComplexRead8_freq=9 -ldbc.finbench.transaction.queries.ComplexRead9_freq=384 -ldbc.finbench.transaction.queries.ComplexRead10_freq=37 -ldbc.finbench.transaction.queries.ComplexRead11_freq=20 -ldbc.finbench.transaction.queries.ComplexRead12_freq=44 -ldbc.finbench.transaction.queries.ComplexRead13_freq=19 diff --git a/src/main/resources/configuration/ldbc/finbench/transaction/sf_internal_test.properties b/src/main/resources/configuration/ldbc/finbench/transaction/sf_internal_test.properties deleted file mode 100644 index b2fb4b504c5c3e966975333cb9de01004ce46394..0000000000000000000000000000000000000000 --- a/src/main/resources/configuration/ldbc/finbench/transaction/sf_internal_test.properties +++ /dev/null @@ -1,65 +0,0 @@ -workload=org.ldbcouncil.finbench.driver.workloads.transaction.LdbcFinBenchTransactionWorkload -db=org.ldbcouncil.finbench.impls.dummy.DummyDb -operation_count=10 -# Short reads random walk dissipation rate, in the interval [1.0-0.0] -# Higher values translate to shorter walks and therefore fewer short reads -ldbc.finbench.transaction.queries.simple_read_dissipation=0.2 -ldbc.finbench.transaction.queries.scale_factor=1 -# params dir -ldbc.finbench.transaction.queries.parameters_dir=src/main/resources/example/data/read_params -ldbc.finbench.transaction.queries.updates_dir=src/main/resources/example/data/incremental_data -# Frequency of complex read queries -ldbc.finbench.transaction.queries.ComplexRead1_freq=26 -ldbc.finbench.transaction.queries.ComplexRead2_freq=37 -ldbc.finbench.transaction.queries.ComplexRead3_freq=106 -ldbc.finbench.transaction.queries.ComplexRead4_freq=36 -ldbc.finbench.transaction.queries.ComplexRead5_freq=72 -ldbc.finbench.transaction.queries.ComplexRead6_freq=316 -ldbc.finbench.transaction.queries.ComplexRead7_freq=48 -ldbc.finbench.transaction.queries.ComplexRead8_freq=9 -ldbc.finbench.transaction.queries.ComplexRead9_freq=384 -ldbc.finbench.transaction.queries.ComplexRead10_freq=37 -ldbc.finbench.transaction.queries.ComplexRead11_freq=20 -ldbc.finbench.transaction.queries.ComplexRead12_freq=44 -ldbc.finbench.transaction.queries.ComplexRead13_freq=19 -# For debugging purposes -ldbc.finbench.transaction.queries.ComplexRead1_enable=true -ldbc.finbench.transaction.queries.ComplexRead2_enable=true -ldbc.finbench.transaction.queries.ComplexRead3_enable=true -ldbc.finbench.transaction.queries.ComplexRead4_enable=true -ldbc.finbench.transaction.queries.ComplexRead5_enable=true -ldbc.finbench.transaction.queries.ComplexRead6_enable=true -ldbc.finbench.transaction.queries.ComplexRead7_enable=true -ldbc.finbench.transaction.queries.ComplexRead8_enable=true -ldbc.finbench.transaction.queries.ComplexRead9_enable=true -ldbc.finbench.transaction.queries.ComplexRead10_enable=true -ldbc.finbench.transaction.queries.ComplexRead11_enable=true -ldbc.finbench.transaction.queries.ComplexRead12_enable=true -ldbc.finbench.transaction.queries.ComplexRead13_enable=true -ldbc.finbench.transaction.queries.SimpleRead1_enable=true -ldbc.finbench.transaction.queries.SimpleRead2_enable=true -ldbc.finbench.transaction.queries.SimpleRead3_enable=true -ldbc.finbench.transaction.queries.SimpleRead4_enable=true -ldbc.finbench.transaction.queries.SimpleRead5_enable=true -ldbc.finbench.transaction.queries.SimpleRead6_enable=true -ldbc.finbench.transaction.queries.SimpleRead7_enable=true -ldbc.finbench.transaction.queries.SimpleRead8_enable=true -ldbc.finbench.transaction.queries.Write1_enable=true -ldbc.finbench.transaction.queries.Write2_enable=true -ldbc.finbench.transaction.queries.Write3_enable=true -ldbc.finbench.transaction.queries.Write4_enable=true -ldbc.finbench.transaction.queries.Write5_enable=true -ldbc.finbench.transaction.queries.Write6_enable=true -ldbc.finbench.transaction.queries.Write7_enable=true -ldbc.finbench.transaction.queries.Write8_enable=true -ldbc.finbench.transaction.queries.Write9_enable=true -ldbc.finbench.transaction.queries.Write10_enable=true -ldbc.finbench.transaction.queries.Write11_enable=true -ldbc.finbench.transaction.queries.Write12_enable=true -ldbc.finbench.transaction.queries.Write13_enable=true -ldbc.finbench.transaction.queries.Write14_enable=true -ldbc.finbench.transaction.queries.ReadWrite1_enable=true -ldbc.finbench.transaction.queries.ReadWrite2_enable=true -ldbc.finbench.transaction.queries.ReadWrite3_enable=true -ldbc.finbench.transaction.queries.ReadWrite4_enable=true -ldbc.finbench.transaction.queries.ReadWrite5_enable=true \ No newline at end of file diff --git a/src/main/resources/example/README.md b/src/main/resources/example/README.md deleted file mode 100644 index 5112bfe15148e272fd23dfb1abe7a2b61bbc74cc..0000000000000000000000000000000000000000 --- a/src/main/resources/example/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# README - -Here are some resources for example use including, -- the example configuration for driver (file) -- the example data - -You can execute the driver with three modes, and you should update the mode in the properties file. -- CREATE_VALIDATION -- VALIDATE_DATABASE -- EXECUTE_BENCHMARK - -execute: -``` -java -cp xxx.jar org.ldbcouncil.finbench.driver.driver.Driver -P example.properties -``` - -debug: -- add VM options `-P src/main/resources/example/example.properties` -- run `Driver.main` \ No newline at end of file diff --git a/src/main/resources/example/ldbc_finbench_driver_dummy.properties b/src/main/resources/example/ldbc_finbench_driver_dummy.properties index 3a2db300984d959eb0f4979578701070a2f4d03e..520453996fbf6399de7b8e6a133a2e6c30bbb46e 100644 --- a/src/main/resources/example/ldbc_finbench_driver_dummy.properties +++ b/src/main/resources/example/ldbc_finbench_driver_dummy.properties @@ -11,7 +11,7 @@ path=cypher/ ############################################################ status=1 thread_count=1 -name=LDBC-FinBench +name=GraphyBench # Modes available: 1.CREATE_VALIDATION 2.VALIDATE_DATABASE 3.EXECUTE_BENCHMARK mode=EXECUTE_BENCHMARK results_log=true @@ -22,71 +22,71 @@ workload_statistics=false spinner_wait_duration=1 help=false ignore_scheduled_start_times=false -workload=org.ldbcouncil.finbench.driver.workloads.transaction.LdbcFinBenchTransactionWorkload -db=org.ldbcouncil.finbench.impls.dummy.DummyDb +workload=org.graphybench.driver.driver.workloads.transaction.GraphyBenchTransactionWorkload +db=org.graphybench.driver.impls.dummy.DummyDb operation_count=100000 validation_parameters_size=1000 validate_workload=true validate_database=validation_params.csv warmup=5 -ldbc.finbench.transaction.queries.parameters_dir=src/main/resources/example/data/read_params -ldbc.finbench.transaction.queries.updates_dir=src/main/resources/example/data/incremental +graphybench.transaction.queries.parameters_dir=src/main/resources/example/data/read_params +graphybench.transaction.queries.updates_dir=src/main/resources/example/data/incremental # param and update files suffix, `csv` or `parquet`, default is `csv` -ldbc.finbench.transaction.queries.files_suffix=csv -ldbc.finbench.transaction.queries.simple_read_dissipation=0.2 -ldbc.finbench.transaction.queries.update_interleave=10000000 -ldbc.finbench.transaction.queries.scale_factor=1 +graphybench.transaction.queries.files_suffix=csv +graphybench.transaction.queries.simple_read_dissipation=0.2 +graphybench.transaction.queries.update_interleave=10000000 +graphybench.transaction.queries.scale_factor=1 # Frequency of complex read queries -ldbc.finbench.transaction.queries.ComplexRead1_freq=1 -ldbc.finbench.transaction.queries.ComplexRead2_freq=1 -ldbc.finbench.transaction.queries.ComplexRead3_freq=1 -ldbc.finbench.transaction.queries.ComplexRead4_freq=1 -ldbc.finbench.transaction.queries.ComplexRead5_freq=1 -ldbc.finbench.transaction.queries.ComplexRead6_freq=1 -ldbc.finbench.transaction.queries.ComplexRead7_freq=1 -ldbc.finbench.transaction.queries.ComplexRead8_freq=1 -ldbc.finbench.transaction.queries.ComplexRead9_freq=1 -ldbc.finbench.transaction.queries.ComplexRead10_freq=1 -ldbc.finbench.transaction.queries.ComplexRead11_freq=1 -ldbc.finbench.transaction.queries.ComplexRead12_freq=1 +graphybench.transaction.queries.ComplexRead1_freq=1 +graphybench.transaction.queries.ComplexRead2_freq=1 +graphybench.transaction.queries.ComplexRead3_freq=1 +graphybench.transaction.queries.ComplexRead4_freq=1 +graphybench.transaction.queries.ComplexRead5_freq=1 +graphybench.transaction.queries.ComplexRead6_freq=1 +graphybench.transaction.queries.ComplexRead7_freq=1 +graphybench.transaction.queries.ComplexRead8_freq=1 +graphybench.transaction.queries.ComplexRead9_freq=1 +graphybench.transaction.queries.ComplexRead10_freq=1 +graphybench.transaction.queries.ComplexRead11_freq=1 +graphybench.transaction.queries.ComplexRead12_freq=1 # For debugging purposes -ldbc.finbench.transaction.queries.ComplexRead1_enable=true -ldbc.finbench.transaction.queries.ComplexRead2_enable=true -ldbc.finbench.transaction.queries.ComplexRead3_enable=true -ldbc.finbench.transaction.queries.ComplexRead4_enable=true -ldbc.finbench.transaction.queries.ComplexRead5_enable=true -ldbc.finbench.transaction.queries.ComplexRead6_enable=true -ldbc.finbench.transaction.queries.ComplexRead7_enable=true -ldbc.finbench.transaction.queries.ComplexRead8_enable=true -ldbc.finbench.transaction.queries.ComplexRead9_enable=true -ldbc.finbench.transaction.queries.ComplexRead10_enable=true -ldbc.finbench.transaction.queries.ComplexRead11_enable=true -ldbc.finbench.transaction.queries.ComplexRead12_enable=true -ldbc.finbench.transaction.queries.SimpleRead1_enable=true -ldbc.finbench.transaction.queries.SimpleRead2_enable=true -ldbc.finbench.transaction.queries.SimpleRead3_enable=true -ldbc.finbench.transaction.queries.SimpleRead4_enable=true -ldbc.finbench.transaction.queries.SimpleRead5_enable=true -ldbc.finbench.transaction.queries.SimpleRead6_enable=true -ldbc.finbench.transaction.queries.Write1_enable=true -ldbc.finbench.transaction.queries.Write2_enable=true -ldbc.finbench.transaction.queries.Write3_enable=true -ldbc.finbench.transaction.queries.Write4_enable=true -ldbc.finbench.transaction.queries.Write5_enable=true -ldbc.finbench.transaction.queries.Write6_enable=true -ldbc.finbench.transaction.queries.Write7_enable=true -ldbc.finbench.transaction.queries.Write8_enable=true -ldbc.finbench.transaction.queries.Write9_enable=true -ldbc.finbench.transaction.queries.Write10_enable=true -ldbc.finbench.transaction.queries.Write11_enable=true -ldbc.finbench.transaction.queries.Write12_enable=true -ldbc.finbench.transaction.queries.Write13_enable=true -ldbc.finbench.transaction.queries.Write14_enable=true -ldbc.finbench.transaction.queries.Write15_enable=true -ldbc.finbench.transaction.queries.Write16_enable=true -ldbc.finbench.transaction.queries.Write17_enable=true -ldbc.finbench.transaction.queries.Write18_enable=true -ldbc.finbench.transaction.queries.Write19_enable=true -ldbc.finbench.transaction.queries.ReadWrite1_enable=true -ldbc.finbench.transaction.queries.ReadWrite2_enable=true -ldbc.finbench.transaction.queries.ReadWrite3_enable=true \ No newline at end of file +graphybench.transaction.queries.ComplexRead1_enable=true +graphybench.transaction.queries.ComplexRead2_enable=true +graphybench.transaction.queries.ComplexRead3_enable=true +graphybench.transaction.queries.ComplexRead4_enable=true +graphybench.transaction.queries.ComplexRead5_enable=true +graphybench.transaction.queries.ComplexRead6_enable=true +graphybench.transaction.queries.ComplexRead7_enable=true +graphybench.transaction.queries.ComplexRead8_enable=true +graphybench.transaction.queries.ComplexRead9_enable=true +graphybench.transaction.queries.ComplexRead10_enable=true +graphybench.transaction.queries.ComplexRead11_enable=true +graphybench.transaction.queries.ComplexRead12_enable=true +graphybench.transaction.queries.SimpleRead1_enable=true +graphybench.transaction.queries.SimpleRead2_enable=true +graphybench.transaction.queries.SimpleRead3_enable=true +graphybench.transaction.queries.SimpleRead4_enable=true +graphybench.transaction.queries.SimpleRead5_enable=true +graphybench.transaction.queries.SimpleRead6_enable=true +graphybench.transaction.queries.Write1_enable=true +graphybench.transaction.queries.Write2_enable=true +graphybench.transaction.queries.Write3_enable=true +graphybench.transaction.queries.Write4_enable=true +graphybench.transaction.queries.Write5_enable=true +graphybench.transaction.queries.Write6_enable=true +graphybench.transaction.queries.Write7_enable=true +graphybench.transaction.queries.Write8_enable=true +graphybench.transaction.queries.Write9_enable=true +graphybench.transaction.queries.Write10_enable=true +graphybench.transaction.queries.Write11_enable=true +graphybench.transaction.queries.Write12_enable=true +graphybench.transaction.queries.Write13_enable=true +graphybench.transaction.queries.Write14_enable=true +graphybench.transaction.queries.Write15_enable=true +graphybench.transaction.queries.Write16_enable=true +graphybench.transaction.queries.Write17_enable=true +graphybench.transaction.queries.Write18_enable=true +graphybench.transaction.queries.Write19_enable=true +graphybench.transaction.queries.ReadWrite1_enable=true +graphybench.transaction.queries.ReadWrite2_enable=true +graphybench.transaction.queries.ReadWrite3_enable=true \ No newline at end of file diff --git a/src/test/java/org/ldbcouncil/finbench/driver/runtime/metrics/DummyCountingMetricsService.java b/src/test/java/org/graphybench/driver/driver/runtime/metrics/DummyCountingMetricsService.java similarity index 97% rename from src/test/java/org/ldbcouncil/finbench/driver/runtime/metrics/DummyCountingMetricsService.java rename to src/test/java/org/graphybench/driver/driver/runtime/metrics/DummyCountingMetricsService.java index 5ad8e08c120f726f833a3507f1ed78d4aac49bc0..2b429c041b23c4fed3372067c2becdafbb1f35e6 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/runtime/metrics/DummyCountingMetricsService.java +++ b/src/test/java/org/graphybench/driver/driver/runtime/metrics/DummyCountingMetricsService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.runtime.metrics; +package org.graphybench.driver.driver.runtime.metrics; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/org/ldbcouncil/finbench/driver/testutils/TestUtils.java b/src/test/java/org/graphybench/driver/driver/testutils/TestUtils.java similarity index 95% rename from src/test/java/org/ldbcouncil/finbench/driver/testutils/TestUtils.java rename to src/test/java/org/graphybench/driver/driver/testutils/TestUtils.java index 9c48b330714488b3dc3cc40995f0e7f8c6ce2b44..d1ab58631f68382e0c48d746787f7979d0998cb1 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/testutils/TestUtils.java +++ b/src/test/java/org/graphybench/driver/driver/testutils/TestUtils.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.testutils; +package org.graphybench.driver.driver.testutils; import static java.lang.String.format; import java.io.File; import java.util.Iterator; import org.apache.commons.io.FileUtils; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; +import org.graphybench.driver.driver.temporal.TimeSource; public class TestUtils { public static File getResource(String path) { diff --git a/src/test/java/org/ldbcouncil/finbench/driver/testutils/ThreadPoolLoadGenerator.java b/src/test/java/org/graphybench/driver/driver/testutils/ThreadPoolLoadGenerator.java similarity index 96% rename from src/test/java/org/ldbcouncil/finbench/driver/testutils/ThreadPoolLoadGenerator.java rename to src/test/java/org/graphybench/driver/driver/testutils/ThreadPoolLoadGenerator.java index 8dc4c2b43da0c3506b6239f75d8a4ec15884a3c7..308ca34426f71b6afea71aa9d80267000b257cc1 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/testutils/ThreadPoolLoadGenerator.java +++ b/src/test/java/org/graphybench/driver/driver/testutils/ThreadPoolLoadGenerator.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.testutils; +package org.graphybench.driver.driver.testutils; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.ldbcouncil.finbench.driver.runtime.scheduling.Spinner; +import org.graphybench.driver.driver.runtime.scheduling.Spinner; public class ThreadPoolLoadGenerator { private final int threadCount; diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/OperationHandlerRunnableContextFactoryTest.java b/src/test/java/org/graphybench/driver/driver/workloads/OperationHandlerRunnableContextFactoryTest.java similarity index 74% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/OperationHandlerRunnableContextFactoryTest.java rename to src/test/java/org/graphybench/driver/driver/workloads/OperationHandlerRunnableContextFactoryTest.java index 29da24cf3f6c9143767684135e62a98f33206754..62c1408128dee6b1f738996a2c0b44e416d50d89 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/OperationHandlerRunnableContextFactoryTest.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/OperationHandlerRunnableContextFactoryTest.java @@ -14,26 +14,26 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads; +package org.graphybench.driver.driver.workloads; import static java.lang.String.format; +import org.graphybench.driver.driver.InstantiatingOperationHandlerRunnerFactory; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.OperationException; +import org.graphybench.driver.driver.OperationHandlerRunnableContext; +import org.graphybench.driver.driver.OperationHandlerRunnerFactory; +import org.graphybench.driver.driver.PoolingOperationHandlerRunnerFactory; +import org.graphybench.driver.driver.runtime.ConcurrentErrorReporter; +import org.graphybench.driver.driver.runtime.coordination.CompletionTimeWriter; +import org.graphybench.driver.driver.runtime.coordination.DummyCompletionTimeWriter; +import org.graphybench.driver.driver.runtime.metrics.DummyCountingMetricsService; +import org.graphybench.driver.driver.runtime.metrics.MetricsService; +import org.graphybench.driver.driver.runtime.scheduling.Spinner; +import org.graphybench.driver.driver.temporal.SystemTimeSource; +import org.graphybench.driver.driver.temporal.TimeSource; +import org.graphybench.driver.driver.workloads.dummy.NothingOperation; import org.junit.jupiter.api.Test; -import org.ldbcouncil.finbench.driver.InstantiatingOperationHandlerRunnerFactory; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.OperationException; -import org.ldbcouncil.finbench.driver.OperationHandlerRunnableContext; -import org.ldbcouncil.finbench.driver.OperationHandlerRunnerFactory; -import org.ldbcouncil.finbench.driver.PoolingOperationHandlerRunnerFactory; -import org.ldbcouncil.finbench.driver.runtime.ConcurrentErrorReporter; -import org.ldbcouncil.finbench.driver.runtime.coordination.CompletionTimeWriter; -import org.ldbcouncil.finbench.driver.runtime.coordination.DummyCompletionTimeWriter; -import org.ldbcouncil.finbench.driver.runtime.metrics.DummyCountingMetricsService; -import org.ldbcouncil.finbench.driver.runtime.metrics.MetricsService; -import org.ldbcouncil.finbench.driver.runtime.scheduling.Spinner; -import org.ldbcouncil.finbench.driver.temporal.SystemTimeSource; -import org.ldbcouncil.finbench.driver.temporal.TimeSource; -import org.ldbcouncil.finbench.driver.workloads.dummy.NothingOperation; public class OperationHandlerRunnableContextFactoryTest { @Test diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/WorkloadStreamsTest.java b/src/test/java/org/graphybench/driver/driver/workloads/WorkloadStreamsTest.java similarity index 96% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/WorkloadStreamsTest.java rename to src/test/java/org/graphybench/driver/driver/workloads/WorkloadStreamsTest.java index 8e4e6c9ec7519d8cb7fa4fd447d4a3fef82ff741..1224ea0ec3c25d72438195ce95ebc5065dbd87cc 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/WorkloadStreamsTest.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/WorkloadStreamsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads; +package org.graphybench.driver.driver.workloads; import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.equalTo; @@ -34,26 +34,26 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; +import org.graphybench.driver.driver.ChildOperationGenerator; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.WorkloadStreams; +import org.graphybench.driver.driver.control.ConsoleAndFileDriverConfiguration; +import org.graphybench.driver.driver.control.DriverConfigurationException; +import org.graphybench.driver.driver.generator.GeneratorFactory; +import org.graphybench.driver.driver.generator.RandomDataGeneratorFactory; +import org.graphybench.driver.driver.log.Log4jLoggingServiceFactory; +import org.graphybench.driver.driver.log.LoggingServiceFactory; +import org.graphybench.driver.driver.util.Tuple3; +import org.graphybench.driver.driver.workloads.dummy.NothingOperation; +import org.graphybench.driver.driver.workloads.dummy.TimedNamedOperation1; +import org.graphybench.driver.driver.workloads.dummy.TimedNamedOperation1Factory; +import org.graphybench.driver.driver.workloads.dummy.TimedNamedOperation2; +import org.graphybench.driver.driver.workloads.dummy.TimedNamedOperation2Factory; +import org.graphybench.driver.driver.workloads.dummy.TimedNamedOperation3; +import org.graphybench.driver.driver.workloads.dummy.TimedNamedOperation3Factory; import org.junit.jupiter.api.Test; -import org.ldbcouncil.finbench.driver.ChildOperationGenerator; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.WorkloadStreams; -import org.ldbcouncil.finbench.driver.control.ConsoleAndFileDriverConfiguration; -import org.ldbcouncil.finbench.driver.control.DriverConfigurationException; -import org.ldbcouncil.finbench.driver.generator.GeneratorFactory; -import org.ldbcouncil.finbench.driver.generator.RandomDataGeneratorFactory; -import org.ldbcouncil.finbench.driver.log.Log4jLoggingServiceFactory; -import org.ldbcouncil.finbench.driver.log.LoggingServiceFactory; -import org.ldbcouncil.finbench.driver.util.Tuple3; -import org.ldbcouncil.finbench.driver.workloads.dummy.NothingOperation; -import org.ldbcouncil.finbench.driver.workloads.dummy.TimedNamedOperation1; -import org.ldbcouncil.finbench.driver.workloads.dummy.TimedNamedOperation1Factory; -import org.ldbcouncil.finbench.driver.workloads.dummy.TimedNamedOperation2; -import org.ldbcouncil.finbench.driver.workloads.dummy.TimedNamedOperation2Factory; -import org.ldbcouncil.finbench.driver.workloads.dummy.TimedNamedOperation3; -import org.ldbcouncil.finbench.driver.workloads.dummy.TimedNamedOperation3Factory; public class WorkloadStreamsTest { diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/DummyDb.java b/src/test/java/org/graphybench/driver/driver/workloads/dummy/DummyDb.java similarity index 93% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/DummyDb.java rename to src/test/java/org/graphybench/driver/driver/workloads/dummy/DummyDb.java index 82335db3db36827d46b6b3fdc62e8277f32c7862..51af595a31ade01355f131f80671f040afadc272 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/DummyDb.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/dummy/DummyDb.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.dummy; +package org.graphybench.driver.driver.workloads.dummy; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.ldbcouncil.finbench.driver.Db; -import org.ldbcouncil.finbench.driver.DbConnectionState; -import org.ldbcouncil.finbench.driver.DbException; -import org.ldbcouncil.finbench.driver.OperationHandler; -import org.ldbcouncil.finbench.driver.ResultReporter; -import org.ldbcouncil.finbench.driver.log.LoggingService; +import org.graphybench.driver.driver.Db; +import org.graphybench.driver.driver.DbConnectionState; +import org.graphybench.driver.driver.DbException; +import org.graphybench.driver.driver.OperationHandler; +import org.graphybench.driver.driver.ResultReporter; +import org.graphybench.driver.driver.log.LoggingService; public class DummyDb extends Db { public static final String ALLOWED_DEFAULT_ARG = "allowed"; diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/DummyResult.java b/src/test/java/org/graphybench/driver/driver/workloads/dummy/DummyResult.java similarity index 93% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/DummyResult.java rename to src/test/java/org/graphybench/driver/driver/workloads/dummy/DummyResult.java index 610a3ddd590168c9239e1a809b26c99d2e127b3b..3f88057bd2d50e7e79f218b3b481f818aef4e5ec 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/DummyResult.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/dummy/DummyResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.dummy; +package org.graphybench.driver.driver.workloads.dummy; public class DummyResult { @Override diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/DummyWorkload.java b/src/test/java/org/graphybench/driver/driver/workloads/dummy/DummyWorkload.java similarity index 93% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/DummyWorkload.java rename to src/test/java/org/graphybench/driver/driver/workloads/dummy/DummyWorkload.java index 310f2b82d4ffc137d113ef1b2c4b29f165e416e5..533f7047f4213f556a3521b56a38fd2ebc2bdfef 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/DummyWorkload.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/dummy/DummyWorkload.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.dummy; +package org.graphybench.driver.driver.workloads.dummy; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.SerializingMarshallingException; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.WorkloadStreams; -import org.ldbcouncil.finbench.driver.generator.GeneratorFactory; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.SerializingMarshallingException; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.WorkloadStreams; +import org.graphybench.driver.driver.generator.GeneratorFactory; public class DummyWorkload extends Workload { public static final Map> OPERATION_TYPE_CLASS_MAPPING = diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/DummyWorkloadFactory.java b/src/test/java/org/graphybench/driver/driver/workloads/dummy/DummyWorkloadFactory.java similarity index 89% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/DummyWorkloadFactory.java rename to src/test/java/org/graphybench/driver/driver/workloads/dummy/DummyWorkloadFactory.java index 2396b4ed434f6d66e8e8895f15666d2d2353134a..f8d421175a3afe4cd33b4f6bd0eaae158e73e51e 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/DummyWorkloadFactory.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/dummy/DummyWorkloadFactory.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.dummy; +package org.graphybench.driver.driver.workloads.dummy; import com.google.common.collect.Lists; import java.util.Iterator; import java.util.List; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.Workload; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.WorkloadStreams; -import org.ldbcouncil.finbench.driver.workloads.WorkloadFactory; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.Workload; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.WorkloadStreams; +import org.graphybench.driver.driver.workloads.WorkloadFactory; public class DummyWorkloadFactory implements WorkloadFactory { private final Iterator streams; diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/NothingOperation.java b/src/test/java/org/graphybench/driver/driver/workloads/dummy/NothingOperation.java similarity index 91% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/NothingOperation.java rename to src/test/java/org/graphybench/driver/driver/workloads/dummy/NothingOperation.java index d2da4d95b0054198beecc098b57f6e1557c13c77..16bc8afd13b696214cf4732b6a0b5fc104401ecf 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/NothingOperation.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/dummy/NothingOperation.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.dummy; +package org.graphybench.driver.driver.workloads.dummy; import com.google.common.collect.ImmutableMap; import java.util.Map; -import org.ldbcouncil.finbench.driver.Operation; +import org.graphybench.driver.driver.Operation; public class NothingOperation extends Operation { public static final int TYPE = 0; diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/NothingOperationFactory.java b/src/test/java/org/graphybench/driver/driver/workloads/dummy/NothingOperationFactory.java similarity index 90% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/NothingOperationFactory.java rename to src/test/java/org/graphybench/driver/driver/workloads/dummy/NothingOperationFactory.java index 565977d839e3e209016d9b0cadee88566353a3c8..c1d0c137eb4f9693b7710f6d4caae8b59bbcae5c 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/NothingOperationFactory.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/dummy/NothingOperationFactory.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.dummy; +package org.graphybench.driver.driver.workloads.dummy; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.Operation; +import org.graphybench.driver.driver.Operation; public class NothingOperationFactory implements Iterator { @Override diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/NothingOperationHandler.java b/src/test/java/org/graphybench/driver/driver/workloads/dummy/NothingOperationHandler.java similarity index 77% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/NothingOperationHandler.java rename to src/test/java/org/graphybench/driver/driver/workloads/dummy/NothingOperationHandler.java index a850db8c5c31690d6d6f0f33fa8c80c64b050415..6599c45baaf9b41f496b5c3e04ecc8fbe58af9fd 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/NothingOperationHandler.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/dummy/NothingOperationHandler.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.dummy; +package org.graphybench.driver.driver.workloads.dummy; -import org.ldbcouncil.finbench.driver.DbConnectionState; -import org.ldbcouncil.finbench.driver.DbException; -import org.ldbcouncil.finbench.driver.OperationHandler; -import org.ldbcouncil.finbench.driver.ResultReporter; +import org.graphybench.driver.driver.DbConnectionState; +import org.graphybench.driver.driver.DbException; +import org.graphybench.driver.driver.OperationHandler; +import org.graphybench.driver.driver.ResultReporter; public class NothingOperationHandler implements OperationHandler { @Override diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation1.java b/src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation1.java similarity index 97% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation1.java rename to src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation1.java index dbe563f475aa7b94f3fd1e970736a868e3221f47..af81bd6c1b8837cd8417828bc557648646e3826d 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation1.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.dummy; +package org.graphybench.driver.driver.workloads.dummy; import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation1Factory.java b/src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation1Factory.java similarity index 94% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation1Factory.java rename to src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation1Factory.java index 98c14d323fc972cc70a8f3b29af0e37fadfad05c..e0e27f963b5d79ec96b64f6e74d3736598bd85dd 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation1Factory.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation1Factory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.dummy; +package org.graphybench.driver.driver.workloads.dummy; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.Operation; +import org.graphybench.driver.driver.Operation; public class TimedNamedOperation1Factory implements Iterator { private final Iterator startTimesAsMilli; diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation2.java b/src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation2.java similarity index 97% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation2.java rename to src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation2.java index 66f3ee5418d989a873309b8dd31d60d99037398a..28d648b4be9eff4233fc972017e0faa62d72cfdf 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation2.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.dummy; +package org.graphybench.driver.driver.workloads.dummy; import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation2Factory.java b/src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation2Factory.java similarity index 94% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation2Factory.java rename to src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation2Factory.java index b9bacc7e5cd4d52991aa1eca1deeee2190028558..5cafec614e7bc2392a3afebae7829f1cc7b1b7c4 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation2Factory.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation2Factory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.dummy; +package org.graphybench.driver.driver.workloads.dummy; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.Operation; +import org.graphybench.driver.driver.Operation; public class TimedNamedOperation2Factory implements Iterator { private final Iterator startTimesAsMilli; diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation3.java b/src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation3.java similarity index 97% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation3.java rename to src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation3.java index 6520513e7ca6638394c7dc77b5bad466bffd4ed5..0ed4aaf76b99d20015f5ae58c74b360acb25d994 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation3.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation3.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.dummy; +package org.graphybench.driver.driver.workloads.dummy; import com.google.common.collect.ImmutableMap; import java.util.Map; diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation3Factory.java b/src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation3Factory.java similarity index 93% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation3Factory.java rename to src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation3Factory.java index f8ec1db4980ccd3264d51d5da0eb399d52d4da89..a2e03a8b7341a5df35ccb663590b04f49655b06e 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/dummy/TimedNamedOperation3Factory.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/dummy/TimedNamedOperation3Factory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.dummy; +package org.graphybench.driver.driver.workloads.dummy; import java.util.Iterator; -import org.ldbcouncil.finbench.driver.Operation; +import org.graphybench.driver.driver.Operation; public class TimedNamedOperation3Factory implements Iterator { private final Iterator startTimes; diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionQueryEqualityTest.java b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionQueryEqualityTest.java similarity index 94% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionQueryEqualityTest.java rename to src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionQueryEqualityTest.java index a5f99f7ebfb1a5015f8d259b3cbd08ac9b314985..f771f28d95974b6ccb301140c58a02e2b7712e09 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionQueryEqualityTest.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionQueryEqualityTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; @@ -23,13 +23,13 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import org.graphybench.driver.driver.result.Path; +import org.graphybench.driver.driver.truncation.TruncationOrder; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead1; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead5; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead5Result; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.ldbcouncil.finbench.driver.result.Path; -import org.ldbcouncil.finbench.driver.truncation.TruncationOrder; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead1; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead5; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead5Result; public class TransactionQueryEqualityTest { public long id1; diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionQueryResultEqualityTest.java b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionQueryResultEqualityTest.java similarity index 98% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionQueryResultEqualityTest.java rename to src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionQueryResultEqualityTest.java index 4d1931e51304c870d2509b349a3ee1873dbae870..64d6731fd6dd65b1ad6a3774c7391f0a1c38f7d2 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionQueryResultEqualityTest.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionQueryResultEqualityTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionReadEventStreamReaderTest.java b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionReadEventStreamReaderTest.java similarity index 94% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionReadEventStreamReaderTest.java rename to src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionReadEventStreamReaderTest.java index b99623dd7b5898ae8700574b0f9244d2ccfe3e47..8abf7d64e88bd5c60ce407098c92b18b09191f33 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionReadEventStreamReaderTest.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionReadEventStreamReaderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; @@ -29,14 +29,14 @@ import java.sql.SQLException; import java.sql.Statement; import java.sql.Timestamp; import java.util.Iterator; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.csv.DuckDbExtractor; +import org.graphybench.driver.driver.csv.FileLoader; +import org.graphybench.driver.driver.generator.EventStreamReader; +import org.graphybench.driver.driver.workloads.transaction.queries.ComplexRead1; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.csv.DuckDbExtractor; -import org.ldbcouncil.finbench.driver.csv.FileLoader; -import org.ldbcouncil.finbench.driver.generator.EventStreamReader; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.ComplexRead1; public class TransactionReadEventStreamReaderTest { diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionSimpleReadGeneratorTest.java b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionSimpleReadGeneratorTest.java similarity index 85% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionSimpleReadGeneratorTest.java rename to src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionSimpleReadGeneratorTest.java index 92553cb453ce0ed6d91dd51a810f97b43f7c9177..58a47fc4ba65d588b9fc98b59eaa767e383d97d0 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionSimpleReadGeneratorTest.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionSimpleReadGeneratorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.eq; @@ -29,11 +29,11 @@ import org.junit.jupiter.api.Test; public class TransactionSimpleReadGeneratorTest { - private LdbcFinBenchSimpleReadGenerator simpleReadGenerator; + private GraphyBenchSimpleReadGenerator simpleReadGenerator; @BeforeEach public void init() { - simpleReadGenerator = mock(LdbcFinBenchSimpleReadGenerator.class); + simpleReadGenerator = mock(GraphyBenchSimpleReadGenerator.class); } // Test with a very small duration @@ -58,7 +58,7 @@ public class TransactionSimpleReadGeneratorTest { public void generateExponentialRandomValue_UniformityDuration() { double uniformRandomValue = 0.5; Date startTime = new Date(); - Date endTime = new Date(startTime.getTime() + LdbcFinBenchSimpleReadGenerator.UNIFORMITY_DURATION); + Date endTime = new Date(startTime.getTime() + GraphyBenchSimpleReadGenerator.UNIFORMITY_DURATION); when(simpleReadGenerator.generateExponentialRandomValue(eq(uniformRandomValue), eq(startTime), eq(endTime))) .thenCallRealMethod(); @@ -91,13 +91,13 @@ public class TransactionSimpleReadGeneratorTest { private double calculateExpectedValue(double uniformRandomValue, Date startTime, Date endTime) { long duration = endTime.getTime() - startTime.getTime(); double scale; - if (LdbcFinBenchSimpleReadGenerator.UNIFORMITY_DURATION < duration) { - scale = 1.0 * LdbcFinBenchSimpleReadGenerator.UNIFORMITY_DURATION / duration; + if (GraphyBenchSimpleReadGenerator.UNIFORMITY_DURATION < duration) { + scale = 1.0 * GraphyBenchSimpleReadGenerator.UNIFORMITY_DURATION / duration; } else { - scale = 1.0 * duration / LdbcFinBenchSimpleReadGenerator.UNIFORMITY_DURATION; + scale = 1.0 * duration / GraphyBenchSimpleReadGenerator.UNIFORMITY_DURATION; } double adjustedValue; - if (LdbcFinBenchSimpleReadGenerator.UNIFORMITY_DURATION < duration) { + if (GraphyBenchSimpleReadGenerator.UNIFORMITY_DURATION < duration) { adjustedValue = 1 - Math.pow(uniformRandomValue, scale); } else { adjustedValue = Math.pow(uniformRandomValue, scale); diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionUpdateEventStreamReaderTest.java b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionUpdateEventStreamReaderTest.java similarity index 92% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionUpdateEventStreamReaderTest.java rename to src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionUpdateEventStreamReaderTest.java index c0d499082dffa440c37978ece5f33469c67a44b4..8ca42452e7351e2fee4cdec61777cfe2c05d87c4 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionUpdateEventStreamReaderTest.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionUpdateEventStreamReaderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -27,14 +27,14 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; import java.util.Iterator; +import org.graphybench.driver.driver.Operation; +import org.graphybench.driver.driver.WorkloadException; +import org.graphybench.driver.driver.csv.DuckDbExtractor; +import org.graphybench.driver.driver.csv.FileLoader; +import org.graphybench.driver.driver.generator.EventStreamReader; +import org.graphybench.driver.driver.workloads.transaction.queries.Write1; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.ldbcouncil.finbench.driver.Operation; -import org.ldbcouncil.finbench.driver.WorkloadException; -import org.ldbcouncil.finbench.driver.csv.DuckDbExtractor; -import org.ldbcouncil.finbench.driver.csv.FileLoader; -import org.ldbcouncil.finbench.driver.generator.EventStreamReader; -import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write1; public class TransactionUpdateEventStreamReaderTest { diff --git a/src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionWorkloadTest.java b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionWorkloadTest.java similarity index 92% rename from src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionWorkloadTest.java rename to src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionWorkloadTest.java index 7cfaff60e6cd0a784fbb7e6dae0a297d39db1602..8acc2ecbcb7faaf05b67dbbffe24e4a07c44cef7 100644 --- a/src/test/java/org/ldbcouncil/finbench/driver/workloads/transaction/TransactionWorkloadTest.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionWorkloadTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.workloads.transaction; +package org.graphybench.driver.driver.workloads.transaction; public class TransactionWorkloadTest { // TODO if it add dummy db, add workload test