From 0aab9e043c20c6df62af4d0f92c3635d4c1df6ca Mon Sep 17 00:00:00 2001 From: Lyu Songlin Date: Fri, 24 Jan 2025 14:45:48 +0800 Subject: [PATCH 1/7] rename graphybench --- .../driver/ChildOperationGenerator.java | 2 +- .../driver}/driver/Db.java | 6 +- .../driver}/driver/DbConnectionState.java | 2 +- .../driver}/driver/DbException.java | 2 +- ...ntiatingOperationHandlerRunnerFactory.java | 2 +- .../driver}/driver/Operation.java | 4 +- .../driver}/driver/OperationException.java | 2 +- .../driver}/driver/OperationHandler.java | 2 +- .../OperationHandlerRunnableContext.java | 16 +-- .../driver/OperationHandlerRunnerFactory.java | 2 +- .../PoolingOperationHandlerRunnerFactory.java | 4 +- .../driver}/driver/ResultReporter.java | 4 +- .../SerializingMarshallingException.java | 2 +- .../driver}/driver/Workload.java | 8 +- .../driver}/driver/WorkloadException.java | 2 +- .../driver}/driver/WorkloadStreams.java | 18 +-- .../driver}/driver/constant/OutputFormat.java | 2 +- .../ConsoleAndFileDriverConfiguration.java | 16 +-- .../driver/control/ControlService.java | 6 +- .../driver/control/DriverConfiguration.java | 2 +- .../control/DriverConfigurationException.java | 2 +- .../driver/control/LocalControlService.java | 8 +- .../driver}/driver/control/OperationMode.java | 2 +- .../driver}/driver/csv/DuckDbExtractor.java | 2 +- .../driver}/driver/csv/FileLoader.java | 10 +- .../csv/charseeker/BufferedCharSeeker.java | 2 +- .../driver/csv/charseeker/CharReadable.java | 2 +- .../driver/csv/charseeker/CharSeeker.java | 2 +- .../csv/charseeker/CharSeekerParams.java | 2 +- .../driver/csv/charseeker/CharSeekers.java | 2 +- .../driver/csv/charseeker/Extractor.java | 2 +- .../driver/csv/charseeker/Extractors.java | 2 +- .../driver}/driver/csv/charseeker/Mark.java | 2 +- .../driver/csv/charseeker/MultiReadable.java | 2 +- .../driver/csv/charseeker/RawFunction.java | 2 +- .../driver/csv/charseeker/RawIterator.java | 2 +- .../driver/csv/charseeker/Readables.java | 2 +- .../csv/charseeker/ThreadAheadReadable.java | 2 +- .../csv/simple/SimpleCsvFileReader.java | 2 +- .../csv/simple/SimpleCsvFileWriter.java | 2 +- .../CalculateWorkloadStatisticsMode.java | 24 ++-- .../driver/CreateValidationParamsMode.java | 28 ++-- .../driver}/driver/driver/Driver.java | 24 ++-- .../driver/driver/DriverException.java | 2 +- .../driver}/driver/driver/DriverMode.java | 2 +- .../driver/driver/ExecuteWorkloadMode.java | 70 +++++----- .../driver}/driver/driver/PrintHelpMode.java | 6 +- .../driver/driver/ResultsDirectory.java | 14 +- .../driver/driver/ValidateDatabaseMode.java | 24 ++-- ...impleDetailedWorkloadMetricsFormatter.java | 10 +- ...SimpleSummaryWorkloadMetricsFormatter.java | 10 +- .../formatter/WorkloadMetricsFormatter.java | 4 +- .../driver/generator/BufferedIterator.java | 4 +- .../driver/generator/ConstantGenerator.java | 2 +- .../CsvEventStreamReaderBasicCharSeeker.java | 8 +- ...EventStreamReaderTimedTypedCharSeeker.java | 8 +- ...vEventStreamReaderTimedTypedCsvReader.java | 4 +- .../driver/generator/DiscreteGenerator.java | 4 +- .../generator/DiscreteListGenerator.java | 4 +- .../DynamicRangeUniformNumberGenerator.java | 4 +- .../driver/generator/EventStreamReader.java | 4 +- .../generator/ExponentialNumberGenerator.java | 4 +- .../driver}/driver/generator/Generator.java | 2 +- .../driver/generator/GeneratorException.java | 2 +- .../driver/generator/GeneratorFactory.java | 16 +-- .../driver/generator/IdentityGenerator.java | 2 +- .../generator/IncrementingGenerator.java | 4 +- .../driver/generator/InterleaveGenerator.java | 4 +- .../IteratorDereferencingGenerator.java | 2 +- .../driver/generator/LimitGenerator.java | 2 +- .../driver/generator/MappingGenerator.java | 4 +- .../driver/generator/MergingGenerator.java | 4 +- .../driver/generator/MinMaxGenerator.java | 2 +- .../NaiveBoundedRangeNumberGenerator.java | 4 +- .../driver/generator/NoRemoveIterator.java | 2 +- .../generator/OperationStreamBuffer.java | 4 +- .../generator/OrderedMultiGenerator.java | 2 +- .../generator/RandomDataGeneratorFactory.java | 6 +- .../driver/generator/RepeatingGenerator.java | 2 +- .../SizedUniformByteGeneratorGenerator.java | 2 +- .../TimeMappingOperationGenerator.java | 6 +- .../generator/UniformByteGenerator.java | 2 +- .../driver/log/Log4jLoggingService.java | 14 +- .../log/Log4jLoggingServiceFactory.java | 4 +- .../driver}/driver/log/LoggingService.java | 6 +- .../driver/log/LoggingServiceFactory.java | 2 +- .../log/RecentThroughputAndDuration.java | 2 +- .../driver}/driver/result/Path.java | 2 +- .../driver/result/PathDeserializer.java | 2 +- .../driver}/driver/result/PathSerializer.java | 2 +- .../runtime/ConcurrentErrorReporter.java | 2 +- .../driver}/driver/runtime/DefaultQueues.java | 2 +- .../driver/runtime/QueueEventFetcher.java | 2 +- .../driver/runtime/QueueEventSubmitter.java | 2 +- .../runtime/SimpleResultsLogWriter.java | 6 +- .../driver/runtime/WorkloadRunner.java | 34 ++--- .../driver/runtime/WorkloadStatusThread.java | 16 +-- .../coordination/CompletionTimeEvent.java | 8 +- .../coordination/CompletionTimeException.java | 2 +- .../coordination/CompletionTimeReader.java | 2 +- .../CompletionTimeReaderWriter.java | 2 +- .../coordination/CompletionTimeService.java | 2 +- .../CompletionTimeServiceAssistant.java | 8 +- .../CompletionTimeStateManager.java | 10 +- .../coordination/CompletionTimeWriter.java | 2 +- .../DummyCompletionTimeWriter.java | 2 +- ...MultiWriterCompletionTimeStateManager.java | 2 +- ...riterCompletionTimeStateManagerWriter.java | 2 +- .../SynchronizedCompletionTimeService.java | 2 +- .../ThreadedQueuedCompletionTimeService.java | 12 +- ...adedQueuedCompletionTimeServiceThread.java | 20 +-- .../executor/ChildOperationExecutor.java | 14 +- ...iatedTimeSubmittingOperationRetriever.java | 10 +- .../runtime/executor/OperationExecutor.java | 4 +- .../executor/OperationExecutorException.java | 2 +- ...rationHandlerRunnableContextRetriever.java | 30 ++--- .../OperationStreamExecutorService.java | 8 +- .../OperationStreamExecutorServiceThread.java | 12 +- .../executor/ThreadPoolOperationExecutor.java | 26 ++-- .../metrics/ContinuousMetricManager.java | 2 +- .../metrics/ContinuousMetricSnapshot.java | 2 +- .../metrics/DiscreteMetricManager.java | 6 +- .../metrics/DiscreteMetricSnapshot.java | 2 +- .../metrics/DisruptorExceptionHandler.java | 4 +- .../metrics/DisruptorSbeMetricsEvent.java | 6 +- .../DisruptorSbeMetricsEventHandler.java | 12 +- .../metrics/DisruptorSbeMetricsService.java | 20 +-- .../metrics/JsonWorkloadMetricsFormatter.java | 4 +- .../metrics/MetricsCollectionException.java | 2 +- .../runtime/metrics/MetricsManager.java | 10 +- .../runtime/metrics/MetricsService.java | 2 +- .../runtime/metrics/NullResultsLogWriter.java | 2 +- .../metrics/OperationMetricsSnapshot.java | 2 +- .../metrics/OperationTypeMetricsManager.java | 8 +- .../runtime/metrics/ResultsLogReader.java | 2 +- .../runtime/metrics/ResultsLogWriter.java | 2 +- .../metrics/WorkloadResultsSnapshot.java | 4 +- .../metrics/WorkloadStatusSnapshot.java | 2 +- .../runtime/metrics/sbe/MessageHeader.java | 2 +- .../runtime/metrics/sbe/MetaAttribute.java | 2 +- .../runtime/metrics/sbe/MetricsEvent.java | 2 +- .../runtime/scheduling/CtDependencyCheck.java | 12 +- .../driver/runtime/scheduling/Spinner.java | 8 +- .../runtime/scheduling/SpinnerCheck.java | 4 +- .../driver/statistics/WorkloadStatistics.java | 16 +-- .../WorkloadStatisticsCalculator.java | 22 ++-- .../driver/temporal/ManualTimeSource.java | 2 +- .../driver/temporal/SystemTimeSource.java | 2 +- .../driver/temporal/TemporalException.java | 2 +- .../driver}/driver/temporal/TemporalUtil.java | 2 +- .../driver}/driver/temporal/TimeSource.java | 2 +- .../driver/truncation/TruncationOrder.java | 2 +- .../driver}/driver/util/Bucket.java | 2 +- .../driver/util/ClassLoaderHelper.java | 14 +- .../driver/util/ClassLoadingException.java | 2 +- .../driver}/driver/util/DbException.java | 2 +- .../driver}/driver/util/FileUtils.java | 2 +- .../driver}/driver/util/Function0.java | 2 +- .../driver}/driver/util/Function1.java | 2 +- .../driver}/driver/util/Function2.java | 2 +- .../driver}/driver/util/Histogram.java | 4 +- .../driver}/driver/util/ListUtils.java | 2 +- .../driver}/driver/util/MapUtils.java | 2 +- .../driver}/driver/util/NumberHelper.java | 4 +- .../driver}/driver/util/Tuple.java | 2 +- .../driver}/driver/util/Tuple2.java | 2 +- .../driver}/driver/util/Tuple3.java | 2 +- .../driver}/driver/util/Tuple4.java | 2 +- .../driver/validation/DbValidationResult.java | 18 +-- .../driver/validation/DbValidator.java | 22 ++-- .../ResultsLogValidationResult.java | 2 +- .../ResultsLogValidationSummary.java | 2 +- ...ResultsLogValidationSummaryCalculator.java | 2 +- .../ResultsLogValidationTolerances.java | 2 +- .../validation/ResultsLogValidator.java | 12 +- .../driver/validation/ValidationEquality.java | 2 +- .../validation/ValidationException.java | 2 +- .../driver/validation/ValidationParam.java | 4 +- .../ValidationParamDeserializer.java | 6 +- .../validation/ValidationParamSerializer.java | 4 +- .../ValidationParamsFromCsvRows.java | 8 +- .../validation/ValidationParamsFromJson.java | 4 +- .../validation/ValidationParamsGenerator.java | 28 ++-- .../validation/ValidationParamsToCsvRows.java | 8 +- .../validation/ValidationParamsToJson.java | 6 +- .../workloads/ClassNameWorkloadFactory.java | 8 +- .../driver/workloads/WorkloadFactory.java | 6 +- .../workloads/simple/SimpleWorkload.java | 12 +- .../driver/workloads/simple/db/SimpleDb.java | 2 +- .../BatchedOperationStreamReader.java | 12 +- .../GraphyBenchSimpleReadGenerator.java} | 114 ++++++++-------- ...nsactionDbValidationParametersFilter.java} | 34 ++--- .../GraphyBenchTransactionWorkload.java} | 62 ++++----- ...enchTransactionWorkloadConfiguration.java} | 94 ++++++------- .../workloads/transaction/NoResult.java} | 2 +- .../transaction/NoResultJsonSerializer.java} | 2 +- .../workloads/transaction/Operation.java} | 84 ++++++------ .../transaction/OperationStreamReader.java | 10 +- .../transaction/QueryEventStreamReader.java | 34 ++--- .../RunnableOperationStreamBatchLoader.java | 14 +- .../transaction/UpdateEventStreamReader.java | 56 ++++---- .../db/DummyGraphyBenchTransactionDb.java} | 2 +- .../transaction/queries/ComplexRead1.java | 6 +- .../transaction/queries/ComplexRead10.java | 4 +- .../queries/ComplexRead10Result.java | 2 +- .../transaction/queries/ComplexRead11.java | 6 +- .../queries/ComplexRead11Result.java | 2 +- .../transaction/queries/ComplexRead12.java | 6 +- .../queries/ComplexRead12Result.java | 2 +- .../queries/ComplexRead1Result.java | 2 +- .../transaction/queries/ComplexRead2.java | 6 +- .../queries/ComplexRead2Result.java | 2 +- .../transaction/queries/ComplexRead3.java | 4 +- .../queries/ComplexRead3Result.java | 2 +- .../transaction/queries/ComplexRead4.java | 4 +- .../queries/ComplexRead4Result.java | 2 +- .../transaction/queries/ComplexRead5.java | 6 +- .../queries/ComplexRead5Result.java | 4 +- .../transaction/queries/ComplexRead6.java | 6 +- .../queries/ComplexRead6Result.java | 2 +- .../transaction/queries/ComplexRead7.java | 6 +- .../queries/ComplexRead7Result.java | 2 +- .../transaction/queries/ComplexRead8.java | 6 +- .../queries/ComplexRead8Result.java | 2 +- .../transaction/queries/ComplexRead9.java | 6 +- .../queries/ComplexRead9Result.java | 2 +- .../transaction/queries/ReadWrite1.java | 6 +- .../transaction/queries/ReadWrite2.java | 8 +- .../transaction/queries/ReadWrite3.java | 8 +- .../transaction/queries/SimpleRead1.java | 4 +- .../queries/SimpleRead1Result.java | 2 +- .../transaction/queries/SimpleRead2.java | 4 +- .../queries/SimpleRead2Result.java | 2 +- .../transaction/queries/SimpleRead3.java | 4 +- .../queries/SimpleRead3Result.java | 2 +- .../transaction/queries/SimpleRead4.java | 4 +- .../queries/SimpleRead4Result.java | 2 +- .../transaction/queries/SimpleRead5.java | 4 +- .../queries/SimpleRead5Result.java | 2 +- .../transaction/queries/SimpleRead6.java | 4 +- .../queries/SimpleRead6Result.java | 2 +- .../workloads/transaction/queries/Write1.java | 6 +- .../transaction/queries/Write10.java | 6 +- .../transaction/queries/Write11.java | 6 +- .../transaction/queries/Write12.java | 6 +- .../transaction/queries/Write13.java | 6 +- .../transaction/queries/Write14.java | 6 +- .../transaction/queries/Write15.java | 6 +- .../transaction/queries/Write16.java | 6 +- .../transaction/queries/Write17.java | 6 +- .../transaction/queries/Write18.java | 6 +- .../transaction/queries/Write19.java | 6 +- .../workloads/transaction/queries/Write2.java | 6 +- .../workloads/transaction/queries/Write3.java | 6 +- .../workloads/transaction/queries/Write4.java | 6 +- .../workloads/transaction/queries/Write5.java | 6 +- .../workloads/transaction/queries/Write6.java | 6 +- .../workloads/transaction/queries/Write7.java | 6 +- .../workloads/transaction/queries/Write8.java | 6 +- .../workloads/transaction/queries/Write9.java | 6 +- .../driver}/impls/dummy/DummyDb.java | 124 +++++++++--------- .../impls/dummy/DummyDbConnectionState.java | 4 +- .../metrics/DummyCountingMetricsService.java | 2 +- .../driver}/driver/testutils/TestUtils.java | 4 +- .../testutils/ThreadPoolLoadGenerator.java | 4 +- ...tionHandlerRunnableContextFactoryTest.java | 32 ++--- .../driver/workloads/WorkloadStreamsTest.java | 40 +++--- .../driver/workloads/dummy/DummyDb.java | 14 +- .../driver/workloads/dummy/DummyResult.java | 2 +- .../driver/workloads/dummy/DummyWorkload.java | 14 +- .../workloads/dummy/DummyWorkloadFactory.java | 12 +- .../workloads/dummy/NothingOperation.java | 4 +- .../dummy/NothingOperationFactory.java | 4 +- .../dummy/NothingOperationHandler.java | 10 +- .../workloads/dummy/TimedNamedOperation1.java | 2 +- .../dummy/TimedNamedOperation1Factory.java | 4 +- .../workloads/dummy/TimedNamedOperation2.java | 2 +- .../dummy/TimedNamedOperation2Factory.java | 4 +- .../workloads/dummy/TimedNamedOperation3.java | 2 +- .../dummy/TimedNamedOperation3Factory.java | 4 +- .../TransactionQueryEqualityTest.java | 12 +- .../TransactionQueryResultEqualityTest.java | 2 +- .../TransactionReadEventStreamReaderTest.java | 14 +- .../TransactionSimpleReadGeneratorTest.java | 2 +- ...ransactionUpdateEventStreamReaderTest.java | 14 +- .../transaction/TransactionWorkloadTest.java | 2 +- 286 files changed, 1138 insertions(+), 1138 deletions(-) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/ChildOperationGenerator.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/Db.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/DbConnectionState.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/DbException.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/InstantiatingOperationHandlerRunnerFactory.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/Operation.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/OperationException.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/OperationHandler.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/OperationHandlerRunnableContext.java (92%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/OperationHandlerRunnerFactory.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/PoolingOperationHandlerRunnerFactory.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/ResultReporter.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/SerializingMarshallingException.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/Workload.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/WorkloadException.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/WorkloadStreams.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/constant/OutputFormat.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/control/ConsoleAndFileDriverConfiguration.java (99%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/control/ControlService.java (84%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/control/DriverConfiguration.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/control/DriverConfigurationException.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/control/LocalControlService.java (90%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/control/OperationMode.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/DuckDbExtractor.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/FileLoader.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/charseeker/BufferedCharSeeker.java (99%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/charseeker/CharReadable.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/charseeker/CharSeeker.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/charseeker/CharSeekerParams.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/charseeker/CharSeekers.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/charseeker/Extractor.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/charseeker/Extractors.java (99%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/charseeker/Mark.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/charseeker/MultiReadable.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/charseeker/RawFunction.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/charseeker/RawIterator.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/charseeker/Readables.java (99%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/charseeker/ThreadAheadReadable.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/simple/SimpleCsvFileReader.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/csv/simple/SimpleCsvFileWriter.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/driver/CalculateWorkloadStatisticsMode.java (84%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/driver/CreateValidationParamsMode.java (87%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/driver/Driver.java (83%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/driver/DriverException.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/driver/DriverMode.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/driver/ExecuteWorkloadMode.java (88%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/driver/PrintHelpMode.java (88%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/driver/ResultsDirectory.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/driver/ValidateDatabaseMode.java (90%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/formatter/SimpleDetailedWorkloadMetricsFormatter.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/formatter/SimpleSummaryWorkloadMetricsFormatter.java (92%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/formatter/WorkloadMetricsFormatter.java (85%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/BufferedIterator.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/ConstantGenerator.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/CsvEventStreamReaderBasicCharSeeker.java (91%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/CsvEventStreamReaderTimedTypedCharSeeker.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/CsvEventStreamReaderTimedTypedCsvReader.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/DiscreteGenerator.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/DiscreteListGenerator.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/DynamicRangeUniformNumberGenerator.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/EventStreamReader.java (89%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/ExponentialNumberGenerator.java (93%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/Generator.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/GeneratorException.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/GeneratorFactory.java (99%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/IdentityGenerator.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/IncrementingGenerator.java (93%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/InterleaveGenerator.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/IteratorDereferencingGenerator.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/LimitGenerator.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/MappingGenerator.java (93%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/MergingGenerator.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/MinMaxGenerator.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/NaiveBoundedRangeNumberGenerator.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/NoRemoveIterator.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/OperationStreamBuffer.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/OrderedMultiGenerator.java (99%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/RandomDataGeneratorFactory.java (92%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/RepeatingGenerator.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/SizedUniformByteGeneratorGenerator.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/TimeMappingOperationGenerator.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/generator/UniformByteGenerator.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/log/Log4jLoggingService.java (92%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/log/Log4jLoggingServiceFactory.java (92%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/log/LoggingService.java (83%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/log/LoggingServiceFactory.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/log/RecentThroughputAndDuration.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/result/Path.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/result/PathDeserializer.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/result/PathSerializer.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/ConcurrentErrorReporter.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/DefaultQueues.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/QueueEventFetcher.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/QueueEventSubmitter.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/SimpleResultsLogWriter.java (91%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/WorkloadRunner.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/WorkloadStatusThread.java (91%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/coordination/CompletionTimeEvent.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/coordination/CompletionTimeException.java (93%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/coordination/CompletionTimeReader.java (93%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/coordination/CompletionTimeReaderWriter.java (92%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/coordination/CompletionTimeService.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/coordination/CompletionTimeServiceAssistant.java (91%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/coordination/CompletionTimeStateManager.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/coordination/CompletionTimeWriter.java (93%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/coordination/DummyCompletionTimeWriter.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/coordination/MultiWriterCompletionTimeStateManager.java (99%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/coordination/MultiWriterCompletionTimeStateManagerWriter.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/coordination/SynchronizedCompletionTimeService.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/coordination/ThreadedQueuedCompletionTimeService.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/coordination/ThreadedQueuedCompletionTimeServiceThread.java (90%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/executor/ChildOperationExecutor.java (85%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/executor/InitiatedTimeSubmittingOperationRetriever.java (92%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/executor/OperationExecutor.java (91%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/executor/OperationExecutorException.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/executor/OperationHandlerRunnableContextRetriever.java (79%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/executor/OperationStreamExecutorService.java (92%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/executor/OperationStreamExecutorServiceThread.java (88%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/executor/ThreadPoolOperationExecutor.java (91%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/ContinuousMetricManager.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/ContinuousMetricSnapshot.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/DiscreteMetricManager.java (92%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/DiscreteMetricSnapshot.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/DisruptorExceptionHandler.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/DisruptorSbeMetricsEvent.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/DisruptorSbeMetricsEventHandler.java (93%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/DisruptorSbeMetricsService.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/JsonWorkloadMetricsFormatter.java (86%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/MetricsCollectionException.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/MetricsManager.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/MetricsService.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/NullResultsLogWriter.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/OperationMetricsSnapshot.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/OperationTypeMetricsManager.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/ResultsLogReader.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/ResultsLogWriter.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/WorkloadResultsSnapshot.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/WorkloadStatusSnapshot.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/sbe/MessageHeader.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/sbe/MetaAttribute.java (92%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/sbe/MetricsEvent.java (99%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/scheduling/CtDependencyCheck.java (87%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/scheduling/Spinner.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/scheduling/SpinnerCheck.java (91%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/statistics/WorkloadStatistics.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/statistics/WorkloadStatisticsCalculator.java (92%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/temporal/ManualTimeSource.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/temporal/SystemTimeSource.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/temporal/TemporalException.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/temporal/TemporalUtil.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/temporal/TimeSource.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/truncation/TruncationOrder.java (93%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/Bucket.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/ClassLoaderHelper.java (90%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/ClassLoadingException.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/DbException.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/FileUtils.java (99%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/Function0.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/Function1.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/Function2.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/Histogram.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/ListUtils.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/MapUtils.java (99%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/NumberHelper.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/Tuple.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/Tuple2.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/Tuple3.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/util/Tuple4.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/DbValidationResult.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/DbValidator.java (89%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/ResultsLogValidationResult.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/ResultsLogValidationSummary.java (99%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/ResultsLogValidationSummaryCalculator.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/ResultsLogValidationTolerances.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/ResultsLogValidator.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/ValidationEquality.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/ValidationException.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/ValidationParam.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/ValidationParamDeserializer.java (91%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/ValidationParamSerializer.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/ValidationParamsFromCsvRows.java (91%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/ValidationParamsFromJson.java (93%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/ValidationParamsGenerator.java (87%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/ValidationParamsToCsvRows.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/validation/ValidationParamsToJson.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/ClassNameWorkloadFactory.java (84%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/WorkloadFactory.java (82%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/simple/SimpleWorkload.java (81%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/simple/db/SimpleDb.java (91%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/BatchedOperationStreamReader.java (84%) rename src/main/java/org/{ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchSimpleReadGenerator.java => graphybench/driver/driver/workloads/transaction/GraphyBenchSimpleReadGenerator.java} (93%) rename src/main/java/org/{ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchTransactionDbValidationParametersFilter.java => graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionDbValidationParametersFilter.java} (88%) rename src/main/java/org/{ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchTransactionWorkload.java => graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java} (93%) rename src/main/java/org/{ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchTransactionWorkloadConfiguration.java => graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkloadConfiguration.java} (91%) rename src/main/java/org/{ldbcouncil/finbench/driver/workloads/transaction/LdbcNoResult.java => graphybench/driver/driver/workloads/transaction/NoResult.java} (94%) rename src/main/java/org/{ldbcouncil/finbench/driver/workloads/transaction/LdbcNoResultJsonSerializer.java => graphybench/driver/driver/workloads/transaction/NoResultJsonSerializer.java} (95%) rename src/main/java/org/{ldbcouncil/finbench/driver/workloads/transaction/LdbcOperation.java => graphybench/driver/driver/workloads/transaction/Operation.java} (46%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/OperationStreamReader.java (84%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/QueryEventStreamReader.java (93%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/RunnableOperationStreamBatchLoader.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/UpdateEventStreamReader.java (94%) rename src/main/java/org/{ldbcouncil/finbench/driver/workloads/transaction/db/DummyLdbcFinBenchTransactionDb.java => graphybench/driver/driver/workloads/transaction/db/DummyGraphyBenchTransactionDb.java} (91%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead1.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead10.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead10Result.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead11.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead11Result.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead12.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead12Result.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead1Result.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead2.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead2Result.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead3.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead3Result.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead4.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead4Result.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead5.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead5Result.java (92%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead6.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead6Result.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead7.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead7Result.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead8.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead8Result.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead9.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ComplexRead9Result.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ReadWrite1.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ReadWrite2.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/ReadWrite3.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/SimpleRead1.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/SimpleRead1Result.java (97%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/SimpleRead2.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/SimpleRead2Result.java (98%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/SimpleRead3.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/SimpleRead3Result.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/SimpleRead4.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/SimpleRead4Result.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/SimpleRead5.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/SimpleRead5Result.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/SimpleRead6.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/SimpleRead6Result.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write1.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write10.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write11.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write12.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write13.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write14.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write15.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write16.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write17.java (91%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write18.java (91%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write19.java (91%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write2.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write3.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write4.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write5.java (96%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write6.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write7.java (95%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write8.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/queries/Write9.java (94%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/impls/dummy/DummyDb.java (85%) rename src/main/java/org/{ldbcouncil/finbench => graphybench/driver}/impls/dummy/DummyDbConnectionState.java (89%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/runtime/metrics/DummyCountingMetricsService.java (97%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/testutils/TestUtils.java (95%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/testutils/ThreadPoolLoadGenerator.java (96%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/OperationHandlerRunnableContextFactoryTest.java (74%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/WorkloadStreamsTest.java (96%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/dummy/DummyDb.java (93%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/dummy/DummyResult.java (93%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/dummy/DummyWorkload.java (93%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/dummy/DummyWorkloadFactory.java (89%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/dummy/NothingOperation.java (91%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/dummy/NothingOperationFactory.java (90%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/dummy/NothingOperationHandler.java (77%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/dummy/TimedNamedOperation1.java (97%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/dummy/TimedNamedOperation1Factory.java (94%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/dummy/TimedNamedOperation2.java (97%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/dummy/TimedNamedOperation2Factory.java (94%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/dummy/TimedNamedOperation3.java (97%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/dummy/TimedNamedOperation3Factory.java (93%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/TransactionQueryEqualityTest.java (94%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/TransactionQueryResultEqualityTest.java (98%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/TransactionReadEventStreamReaderTest.java (94%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/TransactionSimpleReadGeneratorTest.java (98%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/TransactionUpdateEventStreamReaderTest.java (92%) rename src/test/java/org/{ldbcouncil/finbench => graphybench/driver}/driver/workloads/transaction/TransactionWorkloadTest.java (92%) 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 8fc60df..ee05a5b 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 c3fd854..218efef 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 60a0414..10c9b0f 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 997bff6..bffa638 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 d48a3ee..8dd934c 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 99debe0..07131f7 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 4e429ff..13837b4 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 1a71365..fdb0544 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 b27f6ee..7c65b2f 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 466500e..cb0c8f1 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 547ea8d..9309bd9 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 10513de..3221ff6 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 362dcab..d0a68f1 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 db64b0b..bc95c1a 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 fa3f5b8..3653778 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 692d79e..68f67a4 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 9b6ca6c..7792a0d 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 99% 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 ed14d4b..83e169e 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.LdbcFinBenchTransactionWorkload; +import org.graphybench.driver.driver.workloads.transaction.db.DummyLdbcFinBenchTransactionDb; public class ConsoleAndFileDriverConfiguration implements DriverConfiguration { // --- MODE --- 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 7b816b1..ff1eaa9 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 192829f..a0198cf 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 3d3f846..877f43e 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 6172dfe..cd6c0d2 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 da4c8f3..8436d12 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 34cd4c3..d38eb02 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 7fc3e12..d7cc6af 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 514dc9b..c957205 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 1234c09..4331538 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 62a45f7..da1496b 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 c53ecfd..5c3d07f 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 8bbcee7..c6df784 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 6e915aa..ac0a72c 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 6f56ad7..0849f5c 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 10692ca..310a787 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 13725d4..5d749ca 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 46daa73..6b4b08c 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 1ab3105..f7dd23d 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 9a387f9..d21d936 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 484b272..211e873 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 31f1bb1..e98a7f2 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 b955378..7320407 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 f0c1a4f..93994d6 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 2d8ab53..3803957 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 7b4a246..4f66705 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 4d1e29b..cd4281c 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 85ac3ce..c23b764 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 ee5e6e1..7b2dbdf 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 a9a3b48..1382b7f 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 2848802..50f59dd 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 328bde3..44e5bbd 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 66c365a..6e8d661 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 0d362a1..6399ff5 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 856118b..95b0ef3 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 2e90976..ee928c5 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 26cde02..1d581d5 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 5b2e99b..45e2885 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 3c276b0..b6cadf9 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 ef6388f..39c5685 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 cd9c281..cd566d9 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 8c38902..8930a33 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 545fbd9..eef2f1c 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 3d89951..cb4d4ad 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 e0d9bc8..e76aeca 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 c8b9938..22a40b4 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 d418ea8..255d4a4 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 01ed6a2..b7473fd 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 babb87a..abf8d4f 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 bb9e298..10ae457 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 05250ad..d8f5947 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 476870b..fc9ee52 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 f026c3f..5acf9ce 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 dd478c5..c4614d4 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 2473531..8fec024 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 33fffc1..c855cb5 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 6e5165c..f642079 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 ca2ddc0..07bde70 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 265330c..bbc3a4d 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 e955eb6..9757da2 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 183f0cf..b8491d1 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 e8ef8c3..509834e 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 eaa4fe2..1517e7e 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 1a5e0b4..62ba961 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 a33f9e2..f0cdd93 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 7ed783b..d233717 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 92% 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 6a915aa..4e69b09 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/log/Log4jLoggingServiceFactory.java +++ b/src/main/java/org/graphybench/driver/driver/log/Log4jLoggingServiceFactory.java @@ -14,9 +14,9 @@ * 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. 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 7303cf1..5bd2496 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 115e948..ae81583 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 4ce39f3..36f9361 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 9c0f56c..4799d77 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 7c178ab..0400b01 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 e4d1907..4333ee8 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 3af7a17..3331865 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 1084519..81fc606 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 eb2d58a..7e233ed 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 4819651..d2fd993 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 d2b93a9..961637c 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 405bc86..b8646c0 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 f281171..2932c8a 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 6c35b1b..c8dfe5c 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 ada5d1c..ea09878 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 5855193..20542c0 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 390e7f7..5c142e9 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 7f9cdbe..ba08276 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 5086f4f..5a2a949 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 acf814f..481018d 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 61c2dce..037b48c 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 f47e1df..84f94f3 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 23ff4e0..399e88e 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 f9701cf..7f5cad6 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 09881d2..0eb7811 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 7cb901b..f88c633 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 3c96a0e..02b2f81 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 8a4951f..b62b9fd 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 4824ef9..8eb04dd 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 f4af587..7277e85 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 47aefc0..f7ebefb 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 e6e1e28..71a2037 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 8d04bce..a344134 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 8b7cd1c..18c8ea6 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 9ce29aa..7573b7d 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 b851ddc..85b662d 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 0cec0dc..e10f090 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 c2030db..4fd731a 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 9846d3b..776939d 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 879b77c..fb16f40 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 b9deb98..0041073 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 dd32c59..e77eefd 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 de4b083..9f07330 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 be52196..5fee2ef 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 b812c69..69dfe02 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 29e6b82..ab0caf4 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 e161fed..8cf737d 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 77b919c..756e6a2 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 6285838..c731765 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 8fd9784..65d3b4a 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 c2eab21..be095d5 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 f6a3ec6..396d153 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 84348fb..51a2ed1 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 4f99362..88e0d36 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 321ac7f..ac1991a 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 5e1cbf1..918bc87 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 479a18c..f4d8366 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 36f123d..3313ef2 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 edbe4c6..2fafe40 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 536762c..593de46 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 4ce95fb..fb39a3c 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 5d9929f..d4360b8 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 72e3abc..24e3e01 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 015fa2a..c5babdd 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 feded8b..917d3b2 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 7de6f9f..bc5e691 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 abb30c9..e6718dd 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 6932b49..c6f2ef0 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 51e3d97..afd5b05 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 06df2f4..20dc0d8 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 19a6091..a01cf42 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 2d7d9a2..24f92a3 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 def8503..e81325e 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 fecdc26..43b1611 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 88e83c7..abde3d6 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 87e7849..52aaec2 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 f84785c..2a05882 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 e8ef368..96e7df9 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 85c5b29..061ec18 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 be11ebc..e928ea3 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 76d210f..1b6f7b1 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 a96c556..3278823 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 6e4396f..42973d9 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 6bed04a..8224563 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 9b733bd..1ff2cec 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 89% 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 43a6734..c443fd2 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 { /** 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 e27aa01..624a727 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 7d80654..81aaa97 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 e933c76..7f6ad5e 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 80a09ef..ca3e09b 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 ecfbcdd..8c27724 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 53adb12..8b55792 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 70fdc55..766e0ac 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 69035d7..2c7269c 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 91% 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 87887b5..75dc7d1 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.LdbcOperation; public class ValidationParamDeserializer extends StdDeserializer { diff --git a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamSerializer.java b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamSerializer.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamSerializer.java rename to src/main/java/org/graphybench/driver/driver/validation/ValidationParamSerializer.java index e5e5e5c..a13dace 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/validation/ValidationParamSerializer.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamSerializer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.ldbcouncil.finbench.driver.validation; +package org.graphybench.driver.driver.validation; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; -import org.ldbcouncil.finbench.driver.Operation; +import org.graphybench.driver.driver.Operation; public class ValidationParamSerializer extends StdSerializer { 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 9760158..bbd57f5 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 db88091..ccd9e05 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 28b9a7a..f22fd05 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 e6266bf..965a0db 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 2eaf484..f1fe23e 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 e64bdd7..72b6f3c 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 64594d0..4662b40 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 979d025..8bdc43e 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 518cc83..d394244 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 b330361..6f48142 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/LdbcFinBenchSimpleReadGenerator.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchSimpleReadGenerator.java similarity index 93% 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 1fa51d1..1e9dd1f 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 @@ -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,62 +31,62 @@ 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; +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 LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator { public static final double THRESHOLD = 100; 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 88% 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 fabaf2d..9f4a740 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,29 +14,29 @@ * 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; +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 LdbcFinBenchTransactionDbValidationParametersFilter implements DbValidationParametersFilter { private final Map remainingRequiredResultsPerType; 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 93% 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 31c8591..ae3ca3d 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,36 +42,36 @@ 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; +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 LdbcFinBenchTransactionWorkload extends Workload { private Map longReadInterleavesAsMilli; 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 91% 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 3ddbfd1..c22aef4 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,52 +30,52 @@ 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; +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 LdbcFinBenchTransactionWorkloadConfiguration { public static final int WRITE_OPERATION_NO_RESULT_DEFAULT_RESULT = -1; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcNoResult.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResult.java similarity index 94% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcNoResult.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResult.java index fd2ebc6..6914eb6 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcNoResult.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResult.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.databind.annotation.JsonSerialize; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcNoResultJsonSerializer.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResultJsonSerializer.java similarity index 95% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcNoResultJsonSerializer.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResultJsonSerializer.java index c9d515b..1050c10 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcNoResultJsonSerializer.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResultJsonSerializer.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; diff --git a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcOperation.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/Operation.java similarity index 46% rename from src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcOperation.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/Operation.java index 96f5765..9ba709e 100644 --- a/src/main/java/org/ldbcouncil/finbench/driver/workloads/transaction/LdbcOperation.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/Operation.java @@ -14,54 +14,54 @@ * 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.Operation; +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 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 2de8465..1b4a913 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 0ea856d..54debf5 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 94% 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 23829e5..e671f4d 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 { 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 4c09a0d..0be416f 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 91% 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 ac044ba..d26faa4 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 { } 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 95% 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 6caeb50..f9b103f 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,8 +33,8 @@ 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.LdbcOperation; public class ComplexRead1 extends LdbcOperation> { public static final int TYPE = 1; 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 96% 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 031fe08..6304b2d 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,7 +32,7 @@ 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.LdbcOperation; public class ComplexRead10 extends LdbcOperation> { public static final int TYPE = 10; 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 c585b7b..96b2f5b 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 95% 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 ff9c564..dfd20a9 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,8 +32,8 @@ 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.LdbcOperation; public class ComplexRead11 extends LdbcOperation> { public static final int TYPE = 11; 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 434778e..578f04a 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 95% 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 45cdaba..61b9170 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,8 +32,8 @@ 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.LdbcOperation; public class ComplexRead12 extends LdbcOperation> { public static final int TYPE = 12; 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 23877e7..5a37922 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 e6bc0cc..d1c8a51 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 96% 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 8446903..efa34ee 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,8 +34,8 @@ 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.LdbcOperation; public class ComplexRead2 extends LdbcOperation> { public static final int TYPE = 2; 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 876d7ec..3da58c3 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 96% 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 1a18f61..dc7de85 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,7 +33,7 @@ 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.LdbcOperation; public class ComplexRead3 extends LdbcOperation> { public static final int TYPE = 3; 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 a27c480..cbae1f7 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 96% 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 8971d8a..62a8708 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,7 +35,7 @@ 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.LdbcOperation; public class ComplexRead4 extends LdbcOperation> { public static final int TYPE = 4; 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 83023a1..d7d3f3a 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 96% 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 c11eea0..a06d9f0 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,8 +35,8 @@ 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.LdbcOperation; public class ComplexRead5 extends LdbcOperation> { public static final int TYPE = 5; 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 0177255..65c6ca3 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 96% 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 c9f4c4c..5409d49 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,8 +34,8 @@ 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.LdbcOperation; public class ComplexRead6 extends LdbcOperation> { public static final int TYPE = 6; 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 b7a0e49..65523ba 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 96% 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 e702bd5..b6c574a 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,8 +33,8 @@ 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.LdbcOperation; public class ComplexRead7 extends LdbcOperation> { public static final int TYPE = 7; 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 700a910..bab1c59 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 96% 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 2d4eb93..87a927f 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,8 +37,8 @@ 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.LdbcOperation; public class ComplexRead8 extends LdbcOperation> { public static final int TYPE = 8; 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 b46b533..edd466b 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 96% 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 53eb902..3166575 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,8 +34,8 @@ 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.LdbcOperation; public class ComplexRead9 extends LdbcOperation> { public static final int TYPE = 9; 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 223ec8a..1eb065e 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 95% 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 98add7a..2a238a1 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,8 +34,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class ReadWrite1 extends LdbcOperation { public static final int TYPE = 10001; 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 96% 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 ed29f29..fb0bf43 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,9 +35,9 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class ReadWrite2 extends LdbcOperation { public static final int TYPE = 10002; 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 95% 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 5f40870..975e5b4 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,9 +36,9 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class ReadWrite3 extends LdbcOperation { public static final int TYPE = 10003; 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 95% 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 5854a62..b4c7792 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,7 +30,7 @@ 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.LdbcOperation; public class SimpleRead1 extends LdbcOperation> { public static final int TYPE = 101; 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 19956c2..6c6c5cb 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 96% 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 385b3a2..e009f34 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,7 +33,7 @@ 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.LdbcOperation; public class SimpleRead2 extends LdbcOperation> { public static final int TYPE = 102; 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 33a393e..12448b1 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 96% 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 087ef32..46a4c39 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,7 +32,7 @@ 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.LdbcOperation; public class SimpleRead3 extends LdbcOperation> { public static final int TYPE = 103; 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 57a4347..4da505d 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 96% 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 50dfbab..5d8e226 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,7 +32,7 @@ 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.LdbcOperation; public class SimpleRead4 extends LdbcOperation> { public static final int TYPE = 104; 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 a5022da..26de3e7 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 96% 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 52e4830..aa9a1b2 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,7 +32,7 @@ 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.LdbcOperation; public class SimpleRead5 extends LdbcOperation> { public static final int TYPE = 105; 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 dda186f..cd713c5 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 96% 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 65f6e39..6d1b084 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,7 +31,7 @@ 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.LdbcOperation; public class SimpleRead6 extends LdbcOperation> { public static final int TYPE = 106; 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 5ee6c2e..710d4c5 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 94% 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 adb6eb9..12de4c1 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,8 +25,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write1 extends LdbcOperation { public static final int TYPE = 1001; 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 94% 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 8a0d716..5373631 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,8 +26,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write10 extends LdbcOperation { public static final int TYPE = 1010; 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 94% 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 cca760d..5784dc9 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,8 +26,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write11 extends LdbcOperation { public static final int TYPE = 1011; 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 95% 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 3c1bb31..cd0c85d 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,8 +26,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write12 extends LdbcOperation { public static final int TYPE = 1012; 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 95% 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 ff3eaa5..6c5ea85 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,8 +26,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write13 extends LdbcOperation { public static final int TYPE = 1013; 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 94% 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 243a03e..b7aa1b8 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,8 +26,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write14 extends LdbcOperation { public static final int TYPE = 1014; 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 94% 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 0699d3b..6046305 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,8 +26,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write15 extends LdbcOperation { public static final int TYPE = 1015; 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 94% 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 23831e0..500e1a8 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,8 +26,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write16 extends LdbcOperation { public static final int TYPE = 1016; 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 91% 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 5ff7852..036c012 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,8 +27,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write17 extends LdbcOperation { public static final int TYPE = 1017; 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 91% 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 9aeff0a..12bab08 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,8 +25,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write18 extends LdbcOperation { public static final int TYPE = 1018; 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 91% 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 a24e9ef..c9cc03d 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,8 +25,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write19 extends LdbcOperation { public static final int TYPE = 1019; 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 95% 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 9eff582..665e4aa 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,8 +25,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write2 extends LdbcOperation { public static final int TYPE = 1002; 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 94% 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 47b5583..4344b50 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,8 +25,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write3 extends LdbcOperation { public static final int TYPE = 1003; 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 96% 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 9439a10..7627d48 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,8 +26,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write4 extends LdbcOperation { public static final int TYPE = 1004; 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 96% 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 c55b844..2257b5b 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,8 +26,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write5 extends LdbcOperation { public static final int TYPE = 1005; 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 95% 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 a794c1b..811f99e 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,8 +26,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write6 extends LdbcOperation { public static final int TYPE = 1006; 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 95% 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 f101b81..6f5fe71 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,8 +26,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write7 extends LdbcOperation { public static final int TYPE = 1007; 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 94% 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 094df48..7528c3e 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,8 +26,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write8 extends LdbcOperation { public static final int TYPE = 1008; 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 94% 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 d134466..58628c6 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,8 +26,8 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; public class Write9 extends LdbcOperation { public static final int TYPE = 1009; 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 85% 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 d719ff2..9e55077 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.LdbcNoResult; +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"); 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 6c1951d..758a236 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/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 5ad8e08..2b429c0 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 9c48b33..d1ab586 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 8dc4c2b..308ca34 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 29da24c..fe85c8d 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.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; +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; 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 8e4e6c9..c8316af 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; @@ -35,25 +35,25 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; 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; +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; 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 82335db..51af595 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 610a3dd..3f88057 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 310f2b8..533f704 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 2396b4e..f8d4211 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 d2da4d9..16bc8af 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 565977d..c1d0c13 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 a850db8..6599c45 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 dbe563f..af81bd6 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 98c14d3..e0e27f9 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 66f3ee5..28d648b 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 b9bacc7..5cafec6 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 6520513..0ed4aaf 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 f8ec1db..a2e03a8 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 a5f99f7..444721d 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; @@ -25,11 +25,11 @@ import java.util.Date; import java.util.List; 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; +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; 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 4d1931e..64d6731 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 b99623d..cdcf159 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; @@ -31,12 +31,12 @@ import java.sql.Timestamp; import java.util.Iterator; 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; +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; 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 98% 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 92553cb..f6a5efd 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; 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 c0d4990..5255987 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; @@ -29,12 +29,12 @@ import java.sql.Statement; import java.util.Iterator; 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; +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; 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 7cfaff6..8acc2ec 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 -- Gitee From 65044175cec212687a49242bc14397e5938b7e0b Mon Sep 17 00:00:00 2001 From: Lyu Songlin Date: Fri, 24 Jan 2025 14:46:01 +0800 Subject: [PATCH 2/7] rename graphybench --- pom.xml | 6 +- scripts/package-mvn-artifacts.sh | 2 +- .../ConsoleAndFileDriverConfiguration.java | 12 +- .../driver/driver/validation/DbValidator.java | 3 +- .../ValidationParamDeserializer.java | 7 +- .../GraphyBenchSimpleReadGenerator.java | 160 ++++++++--------- ...ansactionDbValidationParametersFilter.java | 16 +- .../GraphyBenchTransactionWorkload.java | 169 +++++++++--------- ...BenchTransactionWorkloadConfiguration.java | 78 ++++---- .../workloads/transaction/NoResult.java | 8 +- .../transaction/NoResultJsonSerializer.java | 10 +- .../workloads/transaction/Operation.java | 7 +- .../RunnableOperationStreamBatchLoader.java | 8 +- .../db/DummyGraphyBenchTransactionDb.java | 2 +- .../transaction/queries/ComplexRead1.java | 4 +- .../transaction/queries/ComplexRead10.java | 4 +- .../transaction/queries/ComplexRead11.java | 4 +- .../transaction/queries/ComplexRead12.java | 4 +- .../transaction/queries/ComplexRead2.java | 4 +- .../transaction/queries/ComplexRead3.java | 4 +- .../transaction/queries/ComplexRead4.java | 4 +- .../transaction/queries/ComplexRead5.java | 4 +- .../transaction/queries/ComplexRead6.java | 4 +- .../transaction/queries/ComplexRead7.java | 4 +- .../transaction/queries/ComplexRead8.java | 4 +- .../transaction/queries/ComplexRead9.java | 4 +- .../transaction/queries/ReadWrite1.java | 10 +- .../transaction/queries/ReadWrite2.java | 10 +- .../transaction/queries/ReadWrite3.java | 10 +- .../transaction/queries/SimpleRead1.java | 4 +- .../transaction/queries/SimpleRead2.java | 4 +- .../transaction/queries/SimpleRead3.java | 4 +- .../transaction/queries/SimpleRead4.java | 4 +- .../transaction/queries/SimpleRead5.java | 4 +- .../transaction/queries/SimpleRead6.java | 4 +- .../workloads/transaction/queries/Write1.java | 10 +- .../transaction/queries/Write10.java | 10 +- .../transaction/queries/Write11.java | 10 +- .../transaction/queries/Write12.java | 10 +- .../transaction/queries/Write13.java | 10 +- .../transaction/queries/Write14.java | 10 +- .../transaction/queries/Write15.java | 10 +- .../transaction/queries/Write16.java | 10 +- .../transaction/queries/Write17.java | 10 +- .../transaction/queries/Write18.java | 10 +- .../transaction/queries/Write19.java | 10 +- .../workloads/transaction/queries/Write2.java | 10 +- .../workloads/transaction/queries/Write3.java | 10 +- .../workloads/transaction/queries/Write4.java | 10 +- .../workloads/transaction/queries/Write5.java | 10 +- .../workloads/transaction/queries/Write6.java | 10 +- .../workloads/transaction/queries/Write7.java | 10 +- .../workloads/transaction/queries/Write8.java | 10 +- .../workloads/transaction/queries/Write9.java | 10 +- .../driver/impls/dummy/DummyDb.java | 46 ++--- .../graphybench/transaction/sf1.properties | 16 ++ .../transaction/sf_internal_test.properties | 65 +++++++ .../ldbc/finbench/transaction/sf1.properties | 16 -- .../transaction/sf_internal_test.properties | 65 ------- .../ldbc_finbench_driver_dummy.properties | 122 ++++++------- ...tionHandlerRunnableContextFactoryTest.java | 2 +- .../driver/workloads/WorkloadStreamsTest.java | 2 +- .../TransactionQueryEqualityTest.java | 4 +- .../TransactionReadEventStreamReaderTest.java | 4 +- .../TransactionSimpleReadGeneratorTest.java | 14 +- ...ransactionUpdateEventStreamReaderTest.java | 4 +- 66 files changed, 568 insertions(+), 572 deletions(-) create mode 100644 src/main/resources/configuration/graphybench/transaction/sf1.properties create mode 100644 src/main/resources/configuration/graphybench/transaction/sf_internal_test.properties delete mode 100644 src/main/resources/configuration/ldbc/finbench/transaction/sf1.properties delete mode 100644 src/main/resources/configuration/ldbc/finbench/transaction/sf_internal_test.properties diff --git a/pom.xml b/pom.xml index d229439..b46813a 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 diff --git a/scripts/package-mvn-artifacts.sh b/scripts/package-mvn-artifacts.sh index 8641c78..61429da 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/graphybench/driver/driver/control/ConsoleAndFileDriverConfiguration.java b/src/main/java/org/graphybench/driver/driver/control/ConsoleAndFileDriverConfiguration.java index 83e169e..c15f115 100644 --- a/src/main/java/org/graphybench/driver/driver/control/ConsoleAndFileDriverConfiguration.java +++ b/src/main/java/org/graphybench/driver/driver/control/ConsoleAndFileDriverConfiguration.java @@ -50,8 +50,8 @@ 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.LdbcFinBenchTransactionWorkload; -import org.graphybench.driver.driver.workloads.transaction.db.DummyLdbcFinBenchTransactionDb; +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/graphybench/driver/driver/validation/DbValidator.java b/src/main/java/org/graphybench/driver/driver/validation/DbValidator.java index c443fd2..472968f 100644 --- a/src/main/java/org/graphybench/driver/driver/validation/DbValidator.java +++ b/src/main/java/org/graphybench/driver/driver/validation/DbValidator.java @@ -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/graphybench/driver/driver/validation/ValidationParamDeserializer.java b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamDeserializer.java index 75dc7d1..7b2a8a8 100644 --- a/src/main/java/org/graphybench/driver/driver/validation/ValidationParamDeserializer.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamDeserializer.java @@ -23,8 +23,7 @@ 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.graphybench.driver.driver.Operation; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; public class ValidationParamDeserializer extends StdDeserializer { @@ -44,8 +43,8 @@ public class ValidationParamDeserializer extends StdDeserializer> 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/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionDbValidationParametersFilter.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionDbValidationParametersFilter.java index 9f4a740..7a317dd 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionDbValidationParametersFilter.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionDbValidationParametersFilter.java @@ -38,11 +38,11 @@ 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 LdbcFinBenchTransactionDbValidationParametersFilter implements DbValidationParametersFilter { +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/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java index ae3ca3d..34c6210 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java @@ -43,7 +43,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; 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; @@ -73,7 +72,7 @@ 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 LdbcFinBenchTransactionWorkload extends Workload { +public class GraphyBenchTransactionWorkload extends Workload { private Map longReadInterleavesAsMilli; private File parametersDir; private File updatesDir; @@ -93,7 +92,7 @@ public class LdbcFinBenchTransactionWorkload extends Workload { @Override public Map> operationTypeToClassMapping() { - return LdbcFinBenchTransactionWorkloadConfiguration.operationTypeToClassMapping(); + return GraphyBenchTransactionWorkloadConfiguration.operationTypeToClassMapping(); } @Override @@ -107,28 +106,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 +141,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 +165,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 +224,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 +238,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 +278,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) { @@ -339,14 +338,14 @@ public class LdbcFinBenchTransactionWorkload extends Workload { 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 +367,7 @@ public class LdbcFinBenchTransactionWorkload extends Workload { @Override public Class getOperationClass() { - return LdbcOperation.class; + return Operation.class; } @Override @@ -429,8 +428,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 +451,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 +499,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 +565,7 @@ public class LdbcFinBenchTransactionWorkload extends Workload { /* * FINAL STREAMS */ - ldbcFinbenchWorkloadStreams.setAsynchronousStream( + GraphybenchWorkloadStreams.setAsynchronousStream( dependentAsynchronousOperationTypes, dependencyAsynchronousOperationTypes, asynchronousDependencyStreams, @@ -574,7 +573,7 @@ public class LdbcFinBenchTransactionWorkload extends Workload { simpleReadsChildGenerator ); - return ldbcFinbenchWorkloadStreams; + return GraphybenchWorkloadStreams; } @Override @@ -599,7 +598,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 +652,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/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkloadConfiguration.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkloadConfiguration.java index c22aef4..5c7d6aa 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkloadConfiguration.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkloadConfiguration.java @@ -77,32 +77,32 @@ 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 LdbcFinBenchTransactionWorkloadConfiguration { +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/graphybench/driver/driver/workloads/transaction/NoResult.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResult.java index 6914eb6..95176a0 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResult.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResult.java @@ -21,10 +21,10 @@ 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 = NoResultJsonSerializer.class) +public class NoResult { + public static final NoResult INSTANCE = new NoResult(); - private LdbcNoResult() { + private NoResult() { } } diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResultJsonSerializer.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResultJsonSerializer.java index 1050c10..715d10f 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResultJsonSerializer.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResultJsonSerializer.java @@ -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 NoResultJsonSerializer extends StdSerializer { - public LdbcNoResultJsonSerializer() { + public NoResultJsonSerializer() { this(null); } - public LdbcNoResultJsonSerializer(Class t) { + public NoResultJsonSerializer(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/graphybench/driver/driver/workloads/transaction/Operation.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/Operation.java index 9ba709e..e42cb06 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/Operation.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/Operation.java @@ -21,7 +21,6 @@ import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.graphybench.driver.driver.Operation; 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; @@ -64,9 +63,9 @@ 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.graphybench.driver.driver.workloads.transaction.queries.Write9; @JsonSubTypes.Type(ReadWrite3.class) }) -public abstract class LdbcOperation extends Operation { +public abstract class Operation extends org.graphybench.driver.driver.Operation { } diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/RunnableOperationStreamBatchLoader.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/RunnableOperationStreamBatchLoader.java index e671f4d..c26cc9f 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/RunnableOperationStreamBatchLoader.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/RunnableOperationStreamBatchLoader.java @@ -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/graphybench/driver/driver/workloads/transaction/db/DummyGraphyBenchTransactionDb.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/db/DummyGraphyBenchTransactionDb.java index d26faa4..b5aba05 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/db/DummyGraphyBenchTransactionDb.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/db/DummyGraphyBenchTransactionDb.java @@ -16,5 +16,5 @@ package org.graphybench.driver.driver.workloads.transaction.db; -public class DummyLdbcFinBenchTransactionDb { +public class DummyGraphyBenchTransactionDb { } diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead1.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead1.java index f9b103f..b92cd64 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead1.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead1.java @@ -34,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class ComplexRead1 extends LdbcOperation> { +public class ComplexRead1 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead10.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead10.java index 6304b2d..1b5449b 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead10.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead10.java @@ -32,9 +32,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class ComplexRead10 extends LdbcOperation> { +public class ComplexRead10 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead11.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead11.java index dfd20a9..d7d9873 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead11.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead11.java @@ -33,9 +33,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class ComplexRead11 extends LdbcOperation> { +public class ComplexRead11 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead12.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead12.java index 61b9170..cd7d4f9 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead12.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead12.java @@ -33,9 +33,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class ComplexRead12 extends LdbcOperation> { +public class ComplexRead12 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead2.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead2.java index efa34ee..6824642 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead2.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead2.java @@ -35,9 +35,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class ComplexRead2 extends LdbcOperation> { +public class ComplexRead2 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead3.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead3.java index dc7de85..c9034ab 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead3.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead3.java @@ -33,9 +33,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class ComplexRead3 extends LdbcOperation> { +public class ComplexRead3 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead4.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead4.java index 62a8708..8dcc765 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead4.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead4.java @@ -35,9 +35,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class ComplexRead4 extends LdbcOperation> { +public class ComplexRead4 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead5.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead5.java index a06d9f0..86d0d06 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead5.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead5.java @@ -36,9 +36,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class ComplexRead5 extends LdbcOperation> { +public class ComplexRead5 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead6.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead6.java index 5409d49..a596991 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead6.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead6.java @@ -35,9 +35,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class ComplexRead6 extends LdbcOperation> { +public class ComplexRead6 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead7.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead7.java index b6c574a..af28276 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead7.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead7.java @@ -34,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class ComplexRead7 extends LdbcOperation> { +public class ComplexRead7 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead8.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead8.java index 87a927f..6d4a3ef 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead8.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead8.java @@ -38,9 +38,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class ComplexRead8 extends LdbcOperation> { +public class ComplexRead8 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead9.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead9.java index 3166575..c8b6286 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead9.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead9.java @@ -35,9 +35,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class ComplexRead9 extends LdbcOperation> { +public class ComplexRead9 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/ReadWrite1.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite1.java index 2a238a1..a312c6f 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite1.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite1.java @@ -34,10 +34,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class ReadWrite1 extends LdbcOperation { +public class ReadWrite1 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite2.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite2.java index fb0bf43..b60e49a 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite2.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite2.java @@ -36,10 +36,10 @@ import java.util.Date; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class ReadWrite2 extends LdbcOperation { +public class ReadWrite2 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite3.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite3.java index 975e5b4..6904f20 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite3.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite3.java @@ -37,10 +37,10 @@ import java.util.Date; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class ReadWrite3 extends LdbcOperation { +public class ReadWrite3 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead1.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead1.java index b4c7792..6c772a4 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead1.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead1.java @@ -30,9 +30,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class SimpleRead1 extends LdbcOperation> { +public class SimpleRead1 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/SimpleRead2.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead2.java index e009f34..955d6cb 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead2.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead2.java @@ -33,9 +33,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class SimpleRead2 extends LdbcOperation> { +public class SimpleRead2 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/SimpleRead3.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead3.java index 46a4c39..1c9960e 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead3.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead3.java @@ -32,9 +32,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class SimpleRead3 extends LdbcOperation> { +public class SimpleRead3 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/SimpleRead4.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead4.java index 5d8e226..53b4262 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead4.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead4.java @@ -32,9 +32,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class SimpleRead4 extends LdbcOperation> { +public class SimpleRead4 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/SimpleRead5.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead5.java index aa9a1b2..19462c8 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead5.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead5.java @@ -32,9 +32,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class SimpleRead5 extends LdbcOperation> { +public class SimpleRead5 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/SimpleRead6.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead6.java index 6d1b084..c9a25da 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead6.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead6.java @@ -31,9 +31,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class SimpleRead6 extends LdbcOperation> { +public class SimpleRead6 extends Operation> { 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/graphybench/driver/driver/workloads/transaction/queries/Write1.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write1.java index 12de4c1..d1827cc 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write1.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write1.java @@ -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.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write1 extends LdbcOperation { +public class Write1 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write10.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write10.java index 5373631..45719da 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write10.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write10.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write10 extends LdbcOperation { +public class Write10 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write11.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write11.java index 5784dc9..8ccf6c3 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write11.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write11.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write11 extends LdbcOperation { +public class Write11 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write12.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write12.java index cd0c85d..c3833cd 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write12.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write12.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write12 extends LdbcOperation { +public class Write12 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write13.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write13.java index 6c5ea85..c090fa3 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write13.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write13.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write13 extends LdbcOperation { +public class Write13 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write14.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write14.java index b7aa1b8..bf88b9d 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write14.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write14.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write14 extends LdbcOperation { +public class Write14 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write15.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write15.java index 6046305..21f05f7 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write15.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write15.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write15 extends LdbcOperation { +public class Write15 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write16.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write16.java index 500e1a8..eaa6e39 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write16.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write16.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write16 extends LdbcOperation { +public class Write16 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write17.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write17.java index 036c012..b979091 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write17.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write17.java @@ -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.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write17 extends LdbcOperation { +public class Write17 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write18.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write18.java index 12bab08..a6c0322 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write18.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write18.java @@ -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.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write18 extends LdbcOperation { +public class Write18 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write19.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write19.java index c9cc03d..ce6ed32 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write19.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write19.java @@ -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.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write19 extends LdbcOperation { +public class Write19 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write2.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write2.java index 665e4aa..f430319 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write2.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write2.java @@ -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.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write2 extends LdbcOperation { +public class Write2 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write3.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write3.java index 4344b50..af39b71 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write3.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write3.java @@ -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.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write3 extends LdbcOperation { +public class Write3 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write4.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write4.java index 7627d48..cc4299d 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write4.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write4.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write4 extends LdbcOperation { +public class Write4 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write5.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write5.java index 2257b5b..853447a 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write5.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write5.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write5 extends LdbcOperation { +public class Write5 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write6.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write6.java index 811f99e..3fe8fac 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write6.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write6.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write6 extends LdbcOperation { +public class Write6 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write7.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write7.java index 6f5fe71..9026bde 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write7.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write7.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write7 extends LdbcOperation { +public class Write7 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write8.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write8.java index 7528c3e..1f2ff05 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write8.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write8.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write8 extends LdbcOperation { +public class Write8 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write9.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write9.java index 58628c6..2c20df4 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write9.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write9.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.LdbcNoResult; -import org.graphybench.driver.driver.workloads.transaction.LdbcOperation; +import org.graphybench.driver.driver.workloads.transaction.NoResult; +import org.graphybench.driver.driver.workloads.transaction.Operation; -public class Write9 extends LdbcOperation { +public class Write9 extends Operation { 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 NoResult deserializeResult(String serializedResults) { + return NoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/impls/dummy/DummyDb.java b/src/main/java/org/graphybench/driver/impls/dummy/DummyDb.java index 9e55077..9b096ed 100644 --- a/src/main/java/org/graphybench/driver/impls/dummy/DummyDb.java +++ b/src/main/java/org/graphybench/driver/impls/dummy/DummyDb.java @@ -31,7 +31,7 @@ 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.LdbcNoResult; +import org.graphybench.driver.driver.workloads.transaction.NoResult; 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; @@ -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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.INSTANCE, rw3); } } } 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 0000000..41898f2 --- /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 0000000..9a1db79 --- /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 0153ac2..0000000 --- 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 b2fb4b5..0000000 --- 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/ldbc_finbench_driver_dummy.properties b/src/main/resources/example/ldbc_finbench_driver_dummy.properties index 3a2db30..5204539 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/graphybench/driver/driver/workloads/OperationHandlerRunnableContextFactoryTest.java b/src/test/java/org/graphybench/driver/driver/workloads/OperationHandlerRunnableContextFactoryTest.java index fe85c8d..62c1408 100644 --- a/src/test/java/org/graphybench/driver/driver/workloads/OperationHandlerRunnableContextFactoryTest.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/OperationHandlerRunnableContextFactoryTest.java @@ -18,7 +18,6 @@ package org.graphybench.driver.driver.workloads; import static java.lang.String.format; -import org.junit.jupiter.api.Test; import org.graphybench.driver.driver.InstantiatingOperationHandlerRunnerFactory; import org.graphybench.driver.driver.Operation; import org.graphybench.driver.driver.OperationException; @@ -34,6 +33,7 @@ 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; public class OperationHandlerRunnableContextFactoryTest { @Test diff --git a/src/test/java/org/graphybench/driver/driver/workloads/WorkloadStreamsTest.java b/src/test/java/org/graphybench/driver/driver/workloads/WorkloadStreamsTest.java index c8316af..1224ea0 100644 --- a/src/test/java/org/graphybench/driver/driver/workloads/WorkloadStreamsTest.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/WorkloadStreamsTest.java @@ -34,7 +34,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.junit.jupiter.api.Test; import org.graphybench.driver.driver.ChildOperationGenerator; import org.graphybench.driver.driver.Operation; import org.graphybench.driver.driver.Workload; @@ -54,6 +53,7 @@ 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; public class WorkloadStreamsTest { diff --git a/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionQueryEqualityTest.java b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionQueryEqualityTest.java index 444721d..f771f28 100644 --- a/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionQueryEqualityTest.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionQueryEqualityTest.java @@ -23,13 +23,13 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; 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; public class TransactionQueryEqualityTest { public long id1; diff --git a/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionReadEventStreamReaderTest.java b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionReadEventStreamReaderTest.java index cdcf159..8abf7d6 100644 --- a/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionReadEventStreamReaderTest.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionReadEventStreamReaderTest.java @@ -29,14 +29,14 @@ import java.sql.SQLException; import java.sql.Statement; import java.sql.Timestamp; import java.util.Iterator; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; 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; public class TransactionReadEventStreamReaderTest { diff --git a/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionSimpleReadGeneratorTest.java b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionSimpleReadGeneratorTest.java index f6a5efd..58a47fc 100644 --- a/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionSimpleReadGeneratorTest.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionSimpleReadGeneratorTest.java @@ -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/graphybench/driver/driver/workloads/transaction/TransactionUpdateEventStreamReaderTest.java b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionUpdateEventStreamReaderTest.java index 5255987..8ca4245 100644 --- a/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionUpdateEventStreamReaderTest.java +++ b/src/test/java/org/graphybench/driver/driver/workloads/transaction/TransactionUpdateEventStreamReaderTest.java @@ -27,14 +27,14 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; import java.util.Iterator; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; 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; public class TransactionUpdateEventStreamReaderTest { -- Gitee From 094bda9307a59fa8d4a4feddcf30d2e1d4f15b51 Mon Sep 17 00:00:00 2001 From: Lyu Songlin Date: Fri, 24 Jan 2025 14:59:59 +0800 Subject: [PATCH 3/7] rename graphybench --- .../transaction/{NoResult.java => GraphyBenchNoResult.java} | 0 ...JsonSerializer.java => GraphyBenchNoResultJsonSerializer.java} | 0 .../transaction/{Operation.java => GraphyBenchOperation.java} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename src/main/java/org/graphybench/driver/driver/workloads/transaction/{NoResult.java => GraphyBenchNoResult.java} (100%) rename src/main/java/org/graphybench/driver/driver/workloads/transaction/{NoResultJsonSerializer.java => GraphyBenchNoResultJsonSerializer.java} (100%) rename src/main/java/org/graphybench/driver/driver/workloads/transaction/{Operation.java => GraphyBenchOperation.java} (100%) diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResult.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchNoResult.java similarity index 100% rename from src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResult.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchNoResult.java diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResultJsonSerializer.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchNoResultJsonSerializer.java similarity index 100% rename from src/main/java/org/graphybench/driver/driver/workloads/transaction/NoResultJsonSerializer.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchNoResultJsonSerializer.java diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/Operation.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchOperation.java similarity index 100% rename from src/main/java/org/graphybench/driver/driver/workloads/transaction/Operation.java rename to src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchOperation.java -- Gitee From b84d24b7afa0524fefaa9d5bdfaf58d75c0de301 Mon Sep 17 00:00:00 2001 From: Lyu Songlin Date: Fri, 24 Jan 2025 15:00:27 +0800 Subject: [PATCH 4/7] rename graphybench --- .../ValidationParamDeserializer.java | 4 +- .../transaction/GraphyBenchNoResult.java | 8 ++-- .../GraphyBenchNoResultJsonSerializer.java | 6 +-- .../transaction/GraphyBenchOperation.java | 2 +- .../GraphyBenchTransactionWorkload.java | 2 +- .../transaction/queries/ComplexRead1.java | 4 +- .../transaction/queries/ComplexRead10.java | 4 +- .../transaction/queries/ComplexRead11.java | 4 +- .../transaction/queries/ComplexRead12.java | 4 +- .../transaction/queries/ComplexRead2.java | 4 +- .../transaction/queries/ComplexRead3.java | 4 +- .../transaction/queries/ComplexRead4.java | 4 +- .../transaction/queries/ComplexRead5.java | 4 +- .../transaction/queries/ComplexRead6.java | 4 +- .../transaction/queries/ComplexRead7.java | 4 +- .../transaction/queries/ComplexRead8.java | 4 +- .../transaction/queries/ComplexRead9.java | 4 +- .../transaction/queries/ReadWrite1.java | 10 ++-- .../transaction/queries/ReadWrite2.java | 10 ++-- .../transaction/queries/ReadWrite3.java | 10 ++-- .../transaction/queries/SimpleRead1.java | 4 +- .../transaction/queries/SimpleRead2.java | 4 +- .../transaction/queries/SimpleRead3.java | 4 +- .../transaction/queries/SimpleRead4.java | 4 +- .../transaction/queries/SimpleRead5.java | 4 +- .../transaction/queries/SimpleRead6.java | 4 +- .../workloads/transaction/queries/Write1.java | 10 ++-- .../transaction/queries/Write10.java | 10 ++-- .../transaction/queries/Write11.java | 10 ++-- .../transaction/queries/Write12.java | 10 ++-- .../transaction/queries/Write13.java | 10 ++-- .../transaction/queries/Write14.java | 10 ++-- .../transaction/queries/Write15.java | 10 ++-- .../transaction/queries/Write16.java | 10 ++-- .../transaction/queries/Write17.java | 10 ++-- .../transaction/queries/Write18.java | 10 ++-- .../transaction/queries/Write19.java | 10 ++-- .../workloads/transaction/queries/Write2.java | 10 ++-- .../workloads/transaction/queries/Write3.java | 10 ++-- .../workloads/transaction/queries/Write4.java | 10 ++-- .../workloads/transaction/queries/Write5.java | 10 ++-- .../workloads/transaction/queries/Write6.java | 10 ++-- .../workloads/transaction/queries/Write7.java | 10 ++-- .../workloads/transaction/queries/Write8.java | 10 ++-- .../workloads/transaction/queries/Write9.java | 10 ++-- .../driver/impls/dummy/DummyDb.java | 46 +++++++++---------- 46 files changed, 180 insertions(+), 180 deletions(-) diff --git a/src/main/java/org/graphybench/driver/driver/validation/ValidationParamDeserializer.java b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamDeserializer.java index 7b2a8a8..3c4b618 100644 --- a/src/main/java/org/graphybench/driver/driver/validation/ValidationParamDeserializer.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamDeserializer.java @@ -23,7 +23,7 @@ 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.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; public class ValidationParamDeserializer extends StdDeserializer { @@ -44,7 +44,7 @@ public class ValidationParamDeserializer extends StdDeserializer { +public class GraphyBenchNoResultJsonSerializer extends StdSerializer { - public NoResultJsonSerializer() { + public GraphyBenchNoResultJsonSerializer() { this(null); } - public NoResultJsonSerializer(Class t) { + public GraphyBenchNoResultJsonSerializer(Class t) { super(t); } diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchOperation.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchOperation.java index e42cb06..686fc8a 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchOperation.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchOperation.java @@ -112,6 +112,6 @@ import org.graphybench.driver.driver.workloads.transaction.queries.Write9; @JsonSubTypes.Type(ReadWrite3.class) }) -public abstract class Operation extends org.graphybench.driver.driver.Operation { +public abstract class GraphyBenchOperation extends org.graphybench.driver.driver.Operation { } diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java index 34c6210..e8fc570 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java @@ -331,7 +331,7 @@ public class GraphyBenchTransactionWorkload extends Workload { * @return */ private Set> getEnabledOperationsHashset(List enabledOperationKeys, - Map params) + Map params) throws WorkloadException { Set> enabledOperationTypes = new HashSet<>(); for (String operationEnableKey : enabledOperationKeys) { diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead1.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead1.java index b92cd64..4b54604 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead1.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead1.java @@ -34,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead1 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead10.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead10.java index 1b5449b..4c97a40 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead10.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead10.java @@ -32,9 +32,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead10 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead11.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead11.java index d7d9873..5646f2b 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead11.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead11.java @@ -33,9 +33,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead11 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead12.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead12.java index cd7d4f9..f904145 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead12.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead12.java @@ -33,9 +33,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead12 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead2.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead2.java index 6824642..5840a25 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead2.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead2.java @@ -35,9 +35,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead2 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead3.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead3.java index c9034ab..153bc13 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead3.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead3.java @@ -33,9 +33,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead3 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead4.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead4.java index 8dcc765..f2bd8d8 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead4.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead4.java @@ -35,9 +35,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead4 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead5.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead5.java index 86d0d06..c1904a9 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead5.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead5.java @@ -36,9 +36,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead5 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead6.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead6.java index a596991..ac23a53 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead6.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead6.java @@ -35,9 +35,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead6 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead7.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead7.java index af28276..4e5e0c7 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead7.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead7.java @@ -34,9 +34,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead7 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead8.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead8.java index 6d4a3ef..daa5c51 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead8.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead8.java @@ -38,9 +38,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead8 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/ComplexRead9.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead9.java index c8b6286..f4c6583 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead9.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ComplexRead9.java @@ -35,9 +35,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ComplexRead9 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/ReadWrite1.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite1.java index a312c6f..7cb9058 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite1.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite1.java @@ -34,10 +34,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ReadWrite1 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite2.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite2.java index b60e49a..9e482f7 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite2.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite2.java @@ -36,10 +36,10 @@ import java.util.Date; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ReadWrite2 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite3.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite3.java index 6904f20..44a6773 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite3.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/ReadWrite3.java @@ -37,10 +37,10 @@ import java.util.Date; import java.util.Map; import java.util.Objects; import org.graphybench.driver.driver.truncation.TruncationOrder; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class ReadWrite3 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead1.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead1.java index 6c772a4..40b9272 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead1.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead1.java @@ -30,9 +30,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class SimpleRead1 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/SimpleRead2.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead2.java index 955d6cb..f0d5fc5 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead2.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead2.java @@ -33,9 +33,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class SimpleRead2 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/SimpleRead3.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead3.java index 1c9960e..c3e7b5d 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead3.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead3.java @@ -32,9 +32,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class SimpleRead3 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/SimpleRead4.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead4.java index 53b4262..7f24ad6 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead4.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead4.java @@ -32,9 +32,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class SimpleRead4 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/SimpleRead5.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead5.java index 19462c8..2132b3b 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead5.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead5.java @@ -32,9 +32,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class SimpleRead5 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/SimpleRead6.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead6.java index c9a25da..4afe578 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead6.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/SimpleRead6.java @@ -31,9 +31,9 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class SimpleRead6 extends Operation> { +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/graphybench/driver/driver/workloads/transaction/queries/Write1.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write1.java index d1827cc..aa6008f 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write1.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write1.java @@ -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.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write1 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write10.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write10.java index 45719da..4e854a8 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write10.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write10.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write10 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write11.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write11.java index 8ccf6c3..e303398 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write11.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write11.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write11 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write12.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write12.java index c3833cd..e578fd0 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write12.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write12.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write12 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write13.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write13.java index c090fa3..262080b 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write13.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write13.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write13 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write14.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write14.java index bf88b9d..85d01c2 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write14.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write14.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write14 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write15.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write15.java index 21f05f7..db4b5bf 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write15.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write15.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write15 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write16.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write16.java index eaa6e39..1015e3c 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write16.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write16.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write16 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write17.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write17.java index b979091..766324c 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write17.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write17.java @@ -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.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write17 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write18.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write18.java index a6c0322..69dddb0 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write18.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write18.java @@ -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.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write18 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write19.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write19.java index ce6ed32..1dd71f0 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write19.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write19.java @@ -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.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write19 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write2.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write2.java index f430319..d1cb331 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write2.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write2.java @@ -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.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write2 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write3.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write3.java index af39b71..156aafc 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write3.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write3.java @@ -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.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write3 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write4.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write4.java index cc4299d..67e6c0f 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write4.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write4.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write4 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write5.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write5.java index 853447a..9cbc83f 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write5.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write5.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write5 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write6.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write6.java index 3fe8fac..1cd2121 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write6.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write6.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write6 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write7.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write7.java index 9026bde..3964a3a 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write7.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write7.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write7 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write8.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write8.java index 1f2ff05..1543443 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write8.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write8.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write8 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write9.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write9.java index 2c20df4..60bd8fe 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write9.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/queries/Write9.java @@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableMap; import java.util.Date; import java.util.Map; import java.util.Objects; -import org.graphybench.driver.driver.workloads.transaction.NoResult; -import org.graphybench.driver.driver.workloads.transaction.Operation; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchNoResult; +import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; -public class Write9 extends Operation { +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 Operation { } @Override - public NoResult deserializeResult(String serializedResults) { - return NoResult.INSTANCE; + public GraphyBenchNoResult deserializeResult(String serializedResults) { + return GraphyBenchNoResult.INSTANCE; } @Override diff --git a/src/main/java/org/graphybench/driver/impls/dummy/DummyDb.java b/src/main/java/org/graphybench/driver/impls/dummy/DummyDb.java index 9b096ed..41fa7fc 100644 --- a/src/main/java/org/graphybench/driver/impls/dummy/DummyDb.java +++ b/src/main/java/org/graphybench/driver/impls/dummy/DummyDb.java @@ -31,7 +31,7 @@ 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.NoResult; +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; @@ -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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.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, NoResult.INSTANCE, rw3); + resultReporter.report(0, GraphyBenchNoResult.INSTANCE, rw3); } } } -- Gitee From eff353730de99aa84b773aeeff576d4d61d1d282 Mon Sep 17 00:00:00 2001 From: Lyu Songlin Date: Fri, 24 Jan 2025 15:13:03 +0800 Subject: [PATCH 5/7] rename graphybench --- .../driver/driver/log/Log4jLoggingServiceFactory.java | 2 +- .../driver/driver/validation/ValidationParamDeserializer.java | 1 + .../workloads/transaction/GraphyBenchTransactionWorkload.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/graphybench/driver/driver/log/Log4jLoggingServiceFactory.java b/src/main/java/org/graphybench/driver/driver/log/Log4jLoggingServiceFactory.java index 4e69b09..10d7a13 100644 --- a/src/main/java/org/graphybench/driver/driver/log/Log4jLoggingServiceFactory.java +++ b/src/main/java/org/graphybench/driver/driver/log/Log4jLoggingServiceFactory.java @@ -19,7 +19,7 @@ package org.graphybench.driver.driver.log; 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/graphybench/driver/driver/validation/ValidationParamDeserializer.java b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamDeserializer.java index 3c4b618..335d4a6 100644 --- a/src/main/java/org/graphybench/driver/driver/validation/ValidationParamDeserializer.java +++ b/src/main/java/org/graphybench/driver/driver/validation/ValidationParamDeserializer.java @@ -23,6 +23,7 @@ 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.graphybench.driver.driver.Operation; import org.graphybench.driver.driver.workloads.transaction.GraphyBenchOperation; public class ValidationParamDeserializer extends StdDeserializer { diff --git a/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java index e8fc570..2f39ed2 100644 --- a/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java +++ b/src/main/java/org/graphybench/driver/driver/workloads/transaction/GraphyBenchTransactionWorkload.java @@ -43,6 +43,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; 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; @@ -367,7 +368,7 @@ public class GraphyBenchTransactionWorkload extends Workload { @Override public Class getOperationClass() { - return Operation.class; + return GraphyBenchOperation.class; } @Override -- Gitee From 21db26ff1bc8a6c05f01d78918a2dedc739ffc3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=89=E7=BF=9F?= Date: Mon, 10 Feb 2025 15:27:22 +0800 Subject: [PATCH 6/7] rename graphybench --- README.md | 111 --------------------------- code_of_conduct.md | 1 - contributing.md | 1 - pom.xml | 8 -- src/main/resources/example/README.md | 19 ----- 5 files changed, 140 deletions(-) delete mode 100644 README.md delete mode 100644 code_of_conduct.md delete mode 100644 contributing.md delete mode 100644 src/main/resources/example/README.md diff --git a/README.md b/README.md deleted file mode 100644 index 135d982..0000000 --- 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 a08cb14..0000000 --- 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 c504a9f..0000000 --- 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/pom.xml b/pom.xml index b46813a..cd5dc08 100644 --- a/pom.xml +++ b/pom.xml @@ -265,12 +265,4 @@ - - - - - - - - diff --git a/src/main/resources/example/README.md b/src/main/resources/example/README.md deleted file mode 100644 index 5112bfe..0000000 --- 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 -- Gitee From b105b4ebf7d387915649eebf5bcbc0d74c9c6769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=89=E7=BF=9F?= Date: Wed, 12 Feb 2025 17:30:00 +0800 Subject: [PATCH 7/7] rename graphybench --- CODEOWNERS | 1 - ldbc-logo.png | Bin 9911 -> 0 bytes 2 files changed, 1 deletion(-) delete mode 100644 CODEOWNERS delete mode 100644 ldbc-logo.png diff --git a/CODEOWNERS b/CODEOWNERS deleted file mode 100644 index c8bb532..0000000 --- a/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -# * @qishipengqsp \ No newline at end of file diff --git a/ldbc-logo.png b/ldbc-logo.png deleted file mode 100644 index 969d58841ab0d2571d819bbaf042ee9cea5a0c89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9911 zcmaKSWmp_d(=`&@o!}DO-Q6|F65J(0g1c*Q_prEy;O@@C;v~V{-Q5=6y`SIT_5GNg zYi4_jq&I#t!t8tMuds3fQ`FfbTOin3bJ^DXpnLWYC>0#1FIpeI;2Ed^;^<*TD->CNp(rYDVuwC6ZbS!8voI-|gE-jKu%}U)uh>)$)ZEA) z;6626R-gZ_IYRNfShCpJ=oQ`gJy%&)-qGPTEg&|B=lk+@yIB}KK-(G#hnBcXfyyfC z>c?1j2|g?A`+wZr+6Xol&>jXFIlnB4Ex!pu+ih`x=BjS@d*kmW@B;Bs952tcL!-y3$e!QDJ`{216_O~lp7Ge2qc5?&K-CY^*2zx^FtWo3Tq z|F4zh)&qlp@aap!h)s-)YPh`lx{9@J=dMa`*QB3{i8u^JyI45oXH$tBXPaoJKsO7v zgnz@|*rFW|nXSY0>p?+hy$|zTu9>FZyZ6}YlHT3>55_%n#(bm5w-Tbyo&GkPWg3iUdwMZU>dkgsw&S-h9#^?#0IYRK_~sy za`3L3WoUn7!F9uj9vlz$PrjSH66$%HjM_Mjq-!^S zfoyE}`$nRE2v=~#dg{-fn9ce=_~{A%-JLMB=hs|Zti9VtPXQdN>uyGA9cz+d!m4nM zP3g!5MYR#rpSuV)`aI+3R}V~rOL(X;qzA)*ku;8ZYl<%FAZqE%l-atI5GCvgZCIYD zRaK)KaJA)2yv%!N4NH#{+?$Fa0k2UuIN_~-j+E%1i@2mU0iCFspm1UCIp+6*} z3~6n4hChH~U5W_6f&pBeA=_OWNl6Ynqg9ezZ5-o#0z;3J&3{-x`&;lCwICFHXB|F| zLGyR=;yB&t>MHtk)&b8H%$tzZJGWUIpoPjik>mcYRF`$s|H4=^8o%hl0}|+ska7_l$X*GL!~b9N z2wi?AdAl$=TzBhCodwSxPe@)WstUm69Zy+gllRceyThr+mll{?AYRL~#PlDA$z&aA z@K6txZH6;eZ$WP>BcsApL*RJ#p@wrXhTD?T*UTrv=91-lLCh8Dl5OZv#0!!QxkojU zOt{tTW_&lo<4z3$!&uii8GWL2t@GEv6!{RfCXm*kpz)VXS{Y+dTeu-=BKC7N4<0Qg zYo}9iQ6@=R<&3WCmJwqv!uPI1JMi1RPvTH?RiT$cpaiI z-@4Js){iD*${|g^p05R6=xGzKU4zQCm`l)Tby)gb_rhdS-T1;V6w7f@YhkCT6|+6b zr!;5`-I9ZG9XjEZoCCONC5Vq1ru(r~QVOa5H#x+9M<0@knZT!yHAq1-<#E@JCo{nUM2DGwr6}%x1v;u;4xLK z;b-wyIMbrz*j<}OxoU1VN~t#}IX-X7KI)db!;T}c(dQb!o!+_Wmj_1~4zce|lD3QO z!p|rBeE~u|5~>9-U-O&A(nDy-oTNKCUV2tWo>Am24q16JTRI;vkALml_`8`uDh#vu z;e%BjXUsQbUjm3bkn8IITZb^9)lj>X@9MjVeT$-Zugb*b>Gc^!a6Fp+A83J+%-e*- zU6VG<>B>iH@QE7|3Iti^xjDYj8Nxz#rM-#roZ6LN4G1*-fbO>aM=L|?b&zb-ptKTC z(yAzAHGE<(7cR&^9w*_F0~Gt;C)>E9$s9k@>S>hp7=O}w~l-&G`7q6!} z%+U+L+5%U{{D%N64LzD~;Z_*xjxcODb-yc%s4{ebHYU>ahhy}C58pD!g|ORQ;84|} zI0qxeC6h)UCagvsIJuUa>h0t#gco7n(gMGAr8&~_--}#riW0cNp4AlHo`P22$-4Yr z*iSU~m++W+zpvFQs48 z9v&8&-fgt|h%IU>y>rH|YQY7m3@^H!AP4lyfYJ*RXa$b6Qb;_-IfV{abdkBf?}ZkG z2kgGN{C&)twi}xLg~Nt`FC$)wW7vv`PGLoYdAitynGjROwG7Ct!qjp=R8(t^e!8=p zbC{)S`JBkk69n|Xomqc*a7^v=H~;sOfNK^}hE-yt=_z}LbiOuore^NYJgn7GFF=fq z;D?SYk@)IF8^8Ij^Dp(CdL=4Kx#@7iDIouoX4yt-CQKO$oubxd@{8RU-|k#maNc6o zuNu+I;dn3J!FCH_Bay&zfdp0ihDvE_GcMwevJm z#zwkPCWy3h4`Whl^;p@~D9+Lu;8q;y$!-v6cMr#aZq{GgFKp<%`jTJF9p^VKM{ia0 zvPXuRqd<~L1Ohw$m3Rx~7bwmw8b9dFs$wEDS6jK?3eL3^@ZF2YQRM)YT69JuSeM&! zj@`@6qwV^2TH0p?IX-1*=XN9;o8XWQaHoi5ID96iYmrYeqFFpQU-M8)G-{hcqdRr` z6i1+bdx=5m*eMx;{VaPr7qQ=)qke%Ekw2U6BDTYE2ll$w%K|hN-V-e9o0?#) zFN1rWHhKzCrD4P0OoNsva~Ic+eKocm$pp6TuWO{#8TopIBj{e7C^;H!gQYC6N7XC9 zSKdA&Y9C)ZDSt|LavJ}=9}2sH*Rpxs=ciXutcYsJ#@pbqeqKAk`bCdG(!RvnwVNks z6JF|7Aaf@UF(1(5#z1O$?;wO&68Os9lU17Cct`0x{gN!Xq8TCRU8psPLGW;?%H?5u z(xTDaGUl}UA&e^7g``VyUF^|QDtwiCcVqewR5nSmk9eOk1CA$4nfN!D(loMQc>0mS zhe-(?(ShmHltAs$qBa_3?*yWyZ+fC-+BWvMzl~XG9c(p&#$-Uo~BCW|E|)(}{QSr9ta^qyWujwo-xHkEj2MaYv(1@SG6knMcGU^T zhg+IVkY-F6T`)Woe~d@y&8h7w@_?}{^<19@YJaMzbY%PCyq?8F+2p=87`Sr>iJ@cjO`92?H8&fmkU){_q0aAl@_eGul z6)_P~A1L3ds?iinRIgWQ4w|gt{^X0Rd{&ZMFEx}#tJJM{-pso>uE2Mrjigd@JTzR2 z_*Rar5b9t!Z|-=EIP%`i1!s-Td4H4r(F)3(OOF$Aa%m}`13tVB*pKNy(pQ}!+#SOe zZZCJI@?~3+2FLBc1|t5n2LiksU7xP8IR-!^pTt`Nq1>E87eka7V*yXN*tA=R4*4xH zcMu+Xpng2mtWrBP#X>k`qm;*Ww~{P_hqtW5XozV)^t;{D7}j>KN^@rB+hJdzL!vb~ z!u`OmpT_&T0_H2?jXE>yPWGG%;Uxy8af_p#nmqr1khb9FQotY|IH8wGn8K`6O=QY| zL1_anU%ec#IDM4O&{O7!Wuq3W;(GX1+dHKG$1hvhnA>dW)e5?__-pj1bP9?RH>gw& z=(>IHQueGJ)$dcQZYwM7GuTga7ux~#7GRa`W>(RL3=U)ZzWAr~*!==7B3_lovpA=cwestvD>3R z5%)q;39HZuiV4t!ZxddTSflw-0(*COTM#WgS!A<=4jO;ds;)@An@2atcFg+7#i$PQ zxemhGulC{Jb9n%4cIyZIMuo|oMKkqc2-*Gjy-~A;VH0?HiCNp*<^jc5Ni{~?`D2SP z@YE|OAkDFK=71evl5An~fy1q$w0TW>hQ9}MfCHi%SkA*hgLc%9EE27HeG-RGf#EGLIIdEI}edGlw(V z7vA56b5S5u`Eyk0?jYYrvE2s)KN#m?)|4k#sul4W?m_q0=8B0CT1ge4R*UY??X7$% zk#x4Qk|=VPJpdxB4dv9We=-k!fyZ+d0(?pWxjCi^=slP^32xHhUY2KxsZ&n2 zXdVWHBxH0+So;CDZQdkU+*XpNP*iRj4ame!RS1^`$B_vC_c=8n|H=^2U*B@N2{^Qd zxK4j?rL)xwq6vpY0aYRJ>M+_;jhL>_i`3k6Ftjcs^K6S+#FaKDTEzyJYZi#y!cjFW%%8NzCU^%%{ti4i;Mx&!H-G z94t)MC%}l#oMq2y&<4KH4ebgU6-;i(M{B@SnHuIBA2pE4r!WqWPfz$X$NUBLnVt>3 z@2dVzN0yobrw-3uuUg9*xesh0Q_j!pAakZSq$Q%5$WA`^21UH~oXqelFg#HUOyH{!vJJ2O_Tr`R z%bJb6;&aR@U7DuL-QX)OHm{MN@2A?Z;vGAdmMGB}8lL;&+Us-E;i-y_qoVU&qgq2Y zwk$rhhYXHq8P$5+T>rX&i3*!rO3tbpW>7ZzSCLWp>7+S|>L)WhMFeqrvu!~Ek1!`& z5hV@+QqDDN^}FhjH^Rs-KA;&mv56<9`>rR}9Y0S-5kHMz9Yb1kUs{@5opxh)#6rR*-SUt*{0rc(yDmoI`oAG&a)= zUR$anj+84+6=HcYHA!sj>_Rw^E%co`+m2Xd+kOof;Y^M>N3722vfY6=Ir~LX^f_+> z;PUeq{RdkCk)D-8ri7qxW%7;sk;O?E_LTIufb1Ml!*?j-!5HwUp^-l+5wfB;$ zaKK9+7$o31hQen5fQPCIjZc5Qr>2|hRI>#WRE;-X<_C{;e!J@Xy-1zz5`NdvajA{9vpmwqteCpwGJ1j2I;U-q1uq+EdM~JB62AV&eQFd72M4=-ciD}OeE6pnZ^1$+ zld9Ys0N6YTCG2ae1zc?#0gW{iZk?zF!u5=Wo0?T&HJy1neDC`5VPseVwF&na$)6ZA z2yCgZ(ld8-<7ANTd8QcU?8Ok48UhLQ-*b{~=)Dl%3_oGk47n1Nf}8de%pWsOi4+3q zNu~6;TqOdtb05T=`u9xb7!$KkrBwDh?5J5^VUV*|u>%MRI5_o9TMyI<0*NU%tRwXuOMcQo5Y+%9h4$GgXAM||cP#gC^+Bzq;&SLu6-w)-|Xa5glo3n?iYC$g5{KNs!&Z}pirw8W5<2ySoh z10SJMk?-j{a6&U%Wtm-V1#w8{o*NHC@T*U`we1R=zv>Ydb?OV0$eJy8IJ4S)G!7^} zF0h{@O7j)|mdRDIE-?j#o{k&~asR~~C^HsM?8JY;KmcucAqw!+^!vkv+OB2&iuRS2 z1#AtR=(3f<*#L#|21+$p)gmUv*WkM^Zx?o;@;={@)B;r#z0A&^pi@ILqYX`~1=hN! z(qrzG+R8QY$);|--95<+UvosnXBhCGzIW7{^lU*>6U9-=cZE@T-R236|@y4`Xk3{ z!c>{bMsw1OvHt#KQdQK_5NlDFL6fLY&0MKEK`mBub z@l3H5B=Q{><_qgNEG9M6U$sKWJ@nHL z&laLYldi&jEVMbezn#M(GA9=>zjnT;Sy`GhjVrIskC$l9dNca`wQj~b26d0cVEmPa z^o6p^Erl!qMw(Ut-S)YhadpREgC(ODd-(i^WQ(=-zxMD7vy`fO=_S{~9yPA7!@Qo1 zAoo<95|=P&P@U>^vEFP)zbx6j!!ZYDULNe2I8d9__a;JL+(;z-=v~2pd}}ZFZ-_i1 zw*b@jWM6GSu=|O)?dev%GXQVT&5x(>On9sTb2M|lcN}dx2Bk3hWwu`CRVZ$KT=o3N z-AUxt6^3fM_`h?d#!YiXTWrI8Rb%)Kv;)MPz}Sh?^hN!5l!uEo!h9QBF7z+)sQZhc zI<9;~sCyw1_wJih`8wJe)W_S@W`LqrOAaYeB^Co#y{`wG>#2T>-^z}zk+(N{>Y@)z zpce!CC|VDMK(%Xrk=Z**K(z;?;H`UM~>lY zKasG)cdS+S+4~yWmze(y(eJPECiCeq`SrW-&g`}$T60CoHlTqet7FV|q3M(5`KkuM z)%X~l6)m_FwM{pngFGN&Ws(v+YV<*h~864aDj71)YVW|!7X0ze6i+a|k`9E$sgk_)8x!>Bf%B+~y`cws}Iaz}3 z75@xGP^UX35}Oi48KiwYZX35_GVk>X$LK6yTs-jwn*(2;+iM=0r8=4Y&2(CiU($fzIe=eO;Kq=sVNJ3Lr>9?&XSrzUviIR{ z!HK1hvx*~fo1fQ(gHRKzH#%I^aSGN1kblY4n1&61>!PAr!b)sxR{)yf+3Q02im$Ko zD(ZooQ;&fL^n*1)^#2JFgfg5zUQz@}Efd7ov#~cb#pR4!qN!YcrUP#Lt-*pz-|rH> zbvN+-HhPB#;q)7J8)Kx4wWQ#BfS;%30b>_aqL^-m|__a(EM2sd23zy?SxQ?S@Hjmid zZV`?Ny{S+|t~v;7f}dDvN&YXN{xg-fmtMC6&WrgU@(ec3>vOh$BHu{Aa9FAkLKp^7 zK9|9oKi$9=GBRYrpE778d}_sBQHr?E48VD%#Aw}heDUEq)Q0>j*t7x2mRK|2hY(9V zlXeqUDKa*|YOFaK%IM9%ovjE=l7K9=|D?;o9{u6#cisEQ=Z?L+7#o}x#e94XyOjhR zaHl;`)9Sds=!&Kz>POTGbn22mPF}$jl&tNeg7H4_J-VEYD zoIA>)Q^ChN8ol`w=64#%DwJVPY?0^5W_!ewn?R#b#>Hp%!TUq;V8bvazJTn#$-hU$ z4D8qe-0G+rNrPG1REof{-lT6+&p(btxm4S9YF*8B-=tWlJK4QfbG*-Io7^oBl+I zDw2Z(og2G>Cb5)>9#x zkS8VVrULf|303hpjkKpKv_%=uY+d%lgAHJ#41Z_Ys&SYz1tAcI*hD_Wmcyaw?j|JS zQ99iemcHraXeK9r&CR1eAicHy$b+jDcDOx>F}`s0c6q%Q>skF%#-(^qogpq@5z+ro z?3;IR5Nq1rHo;h0d-m2bWXHv>n^BVt0#+MKJ9;fSvZ|)aP~qq3LbPBa{@a@m;lTky zCE*vw^0&Wo3_z{T2GZd<1S(G_jn;%fs(M0oYW$YfMz;^L^)iUJ)>zNRZfib9Yr^*u z)WHoHCv%pTYZRXw+d4ehG#hBMiW3+JzAnGxZQq^f{+R=zQ&i5!Hm>*T(m**RY;*U= z35TrrF$|vEW0K7B{f!Njjn{jZ)GAAEe(Y8RETq zXWaTFv0Vp~s)BHf9$1|`PiEO|pVRWo)yMMnY#?Zku{8l3rFEmLl}_+_4KCeCMjZgiE*eVWry#a&Nkj;$Vc9D&24?7@%_4jE6lAJpA@1-z-Uk+)n)*-j{}1 z*KX*O>JflP&{+zikPU(yf?`*FugQb(Iro1@)Zp{iMfHpq6>rj`cf&gFN>#f3{=Rq1vq1`Pk%K@mwyX@8P`+Gh{lmDd#&Mgk5I5JF?j0cW}=E-S%xSZnD zT(d6tHx)H#NbzsiHAnd z?@I+pFpQ@$0)?!Et*6rcsw2kvX)HvyTWD`*t-quRapo$vRz@^x`cgXJ$sirZ^*8Pl^pTJNKC6T5B(aX5avZS&rjMc70SY1!{(3l9Zj<19xs>XG!iqM+S z+Uv!~?cuv7*S9bKcw5J4eChSH#;xsws0=i4qE@%9CC@bBJX3orPG$oF6Y3W$e;8(b zxG_EG3VNroiShp=slhM}tk9~@BuD%uAUy=5O`m}FocJdg8Xg>te{MjEjat^!ygQCB zH0HJr=?2B(f8_EGhG+(vIk-OedIc4=hL9GVP(hsl^#THU2sq&GufBhX5}DAP+NuJh zFV=BRha|n1@ONeFjT$yUsw^}enMGoe>%+e@%RUf&8y%zQLv)~GFqpmuQDEuovP)-1 zi&UOr5Vj&0h$m_GH*TXN7|WnsELZ4xZ?{>mI(ob-m%H_q^8?u5{W#*Ms`s!*g7BQe zg-PzNcbGSq+Uv1CJ<}hDeypm*Cs<`MvEY~Zw(Axhdl=Kh1Y}uv?wL6{gu|k-w443U z6OTmT!BO44+S&=>$vIjOWLe^}E1S zp+afcs@^(v7DOzu?>#0iAQeS^Fip0wR-|_<%|${xiXqBwT4uCn&}_hG&s*U2a3taH zW%j_|hS}zW0HWjmTYG=9#HQShYJTxS;=tT$WjcpVIqyo41&H?RO@Ru#-Ly9lfrm5e zCW7_rcOjb)spU6e)JrOe9rM!T%_hUUufg%!ihwkPVjc6_U^5F5>r}ilWEN8bX?P!6 zxXiPWcv}=$-i-1Wu_Fe`L5sr!H_AjMe86L_{5i#M3wB3cB~7z#=A!*?jo4AE6mKow zH~SvTdpFP|n5pQ&f$c_+h(D(hn{XmIAASw7VW7Up^I~BT;BgBJx{C>454ycW!)yz> qWg{d4TKGpG{QuvSygJB#rwm?`UOhsFKsTAez$nS7%hpJnh5jFr4{|dA -- Gitee