Skip to content

Commit

Permalink
update amount type long to double (#29)
Browse files Browse the repository at this point in the history
  • Loading branch information
@BingTong0
BingTong0 authored May 15, 2023
1 parent 81e8422 commit a0fed9c
Show file tree
Hide file tree
Showing 27 changed files with 150 additions and 150 deletions.
74 changes: 37 additions & 37 deletions ...org/ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchSimpleReadGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@
import org.ldbcouncil.finbench.driver.workloads.transaction.queries.Write9;

public class LdbcFinBenchSimpleReadGenerator implements ChildOperationGenerator {
public static final long THRESHOLD = 100;
public static final double THRESHOLD = 100;
private final double initialProbability;
private final LdbcSimpleQueryFactory[] simpleQueryFactories;
private final double[] probabilityDegradationFactors;
private final Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer;
private final Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer;
private final Queue<Long> personIdBuffer;
private final Queue<Long> companyIdBuffer;
private final long[] interleavesAsMilli;
Expand All @@ -82,7 +82,7 @@ public LdbcFinBenchSimpleReadGenerator(double initialProbability,
long updateInterleaveAsMilli,
Set<Class<? extends Operation>> enabledSimpleReadOperationTypes,
double compressionRatio,
Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer,
Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer,
Queue<Long> personIdBuffer,
Queue<Long> companyIdBuffer,
RandomDataGeneratorFactory randomFactory,
Expand Down Expand Up @@ -327,8 +327,8 @@ static Queue<Long> synchronizedCircularQueueBuffer(int bufferSize) {
return Queues.synchronizedQueue(EvictingQueue.<Long>create(bufferSize));
}

static Queue<Tuple4<Long, Long, Date, Date>> synchronizedCircularTuple4QueueBuffer(int bufferSize) {
return Queues.synchronizedQueue(EvictingQueue.<Tuple4<Long, Long, Date, Date>>create(bufferSize));
static Queue<Tuple4<Long, Double, Date, Date>> synchronizedCircularTuple4QueueBuffer(int bufferSize) {
return Queues.synchronizedQueue(EvictingQueue.<Tuple4<Long, Double, Date, Date>>create(bufferSize));
}

static Queue<Long> constantBuffer(final long value) {
Expand Down Expand Up @@ -425,15 +425,15 @@ public void clear() {
};
}

static Queue<Tuple4<Long, Long, Date, Date>> constantTuple4Buffer(final Tuple4<Long, Long, Date, Date> value) {
return new Queue<Tuple4<Long, Long, Date, Date>>() {
static Queue<Tuple4<Long, Double, Date, Date>> constantTuple4Buffer(final Tuple4<Long, Double, Date, Date> value) {
return new Queue<Tuple4<Long, Double, Date, Date>>() {
@Override
public boolean add(Tuple4<Long, Long, Date, Date> longValue) {
public boolean add(Tuple4<Long, Double, Date, Date> longValue) {
return true;
}

@Override
public boolean offer(Tuple4<Long, Long, Date, Date> longValue) {
public boolean offer(Tuple4<Long, Double, Date, Date> longValue) {
return true;
}

Expand All @@ -443,22 +443,22 @@ public boolean remove(Object o) {
}

@Override
public Tuple4<Long, Long, Date, Date> remove() {
public Tuple4<Long, Double, Date, Date> remove() {
throw new UnsupportedOperationException("Method not implemented");
}

@Override
public Tuple4<Long, Long, Date, Date> poll() {
public Tuple4<Long, Double, Date, Date> poll() {
return value;
}

@Override
public Tuple4<Long, Long, Date, Date> element() {
public Tuple4<Long, Double, Date, Date> element() {
return value;
}

@Override
public Tuple4<Long, Long, Date, Date> peek() {
public Tuple4<Long, Double, Date, Date> peek() {
return value;
}

Expand All @@ -478,7 +478,7 @@ public boolean contains(Object o) {
}

@Override
public Iterator<Tuple4<Long, Long, Date, Date>> iterator() {
public Iterator<Tuple4<Long, Double, Date, Date>> iterator() {
throw new UnsupportedOperationException("Method not implemented");
}

Expand All @@ -498,7 +498,7 @@ public boolean containsAll(Collection<?> c) {
}

@Override
public boolean addAll(Collection<? extends Tuple4<Long, Long, Date, Date>> c) {
public boolean addAll(Collection<? extends Tuple4<Long, Double, Date, Date>> c) {
throw new UnsupportedOperationException("Method not implemented");
}

Expand Down Expand Up @@ -729,7 +729,7 @@ public static interface BufferReplenishFun {

private interface LdbcSimpleQueryFactory {
Operation create(
Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer,
Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer,
Queue<Long> personIdBuffer,
Queue<Long> companyIdBuffer,
Operation previousOperation,
Expand All @@ -752,11 +752,11 @@ public void replenish(Operation operation, Object result) {
}

public static class ResultBufferReplenishFun implements BufferReplenishFun {
private final Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer;
private final Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer;
private final Queue<Long> personIdBuffer;
private final Queue<Long> companyIdBuffer;

public ResultBufferReplenishFun(Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer,
public ResultBufferReplenishFun(Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer,
Queue<Long> personIdBuffer,
Queue<Long> companyIdBuffer) {
this.accountIdBuffer = accountIdBuffer;
Expand Down Expand Up @@ -820,7 +820,7 @@ public void replenish(Operation operation, Object result) {
ComplexRead8 complexRead8 = (ComplexRead8) operation;
for (ComplexRead8Result complexRead8Result : typedResults) {
accountIdBuffer.add(new Tuple4<>(complexRead8Result.getDstId(),
complexRead8.getThreshold(),
THRESHOLD,
complexRead8.getStartTime(),
complexRead8.getEndTime()));
}
Expand Down Expand Up @@ -879,7 +879,7 @@ public void replenish(Operation operation, Object result) {
private class NoOpFactory implements LdbcSimpleQueryFactory {
@Override
public Operation create(
Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer,
Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer,
Queue<Long> personIdBuffer,
Queue<Long> companyIdBuffer,
Operation previousOperation,
Expand All @@ -904,7 +904,7 @@ private ErrorFactory(Class operationType) {

@Override
public Operation create(
Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer,
Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer,
Queue<Long> personIdBuffer,
Queue<Long> companyIdBuffer,
Operation previousOperation,
Expand Down Expand Up @@ -940,7 +940,7 @@ private CoinTossingFactory(RandomDataGenerator random,

@Override
public Operation create(
Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer,
Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer,
Queue<Long> personIdBuffer,
Queue<Long> companyIdBuffer,
Operation previousOperation,
Expand Down Expand Up @@ -982,7 +982,7 @@ private RoundRobbinFactory(LdbcSimpleQueryFactory... innerFactories) {

@Override
public Operation create(
Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer,
Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer,
Queue<Long> personIdBuffer,
Queue<Long> companyIdBuffer,
Operation previousOperation,
Expand Down Expand Up @@ -1041,14 +1041,14 @@ private LdbcSimpleQuery1Factory(ScheduledStartTimePolicy scheduledStartTimePolic

@Override
public Operation create(
Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer,
Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer,
Queue<Long> personIdBuffer,
Queue<Long> companyIdBuffer,
Operation previousOperation,
long previousOperationActualStartTimeAsMilli,
long previousOperationRunDurationAsNano,
double state) {
Tuple4<Long, Long, Date, Date> tuple4 = accountIdBuffer.poll();
Tuple4<Long, Double, Date, Date> tuple4 = accountIdBuffer.poll();
if (null == tuple4) {
return null;
} else {
Expand Down Expand Up @@ -1098,14 +1098,14 @@ private LdbcSimpleQuery2Factory(ScheduledStartTimePolicy scheduledStartTimePolic

@Override
public Operation create(
Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer,
Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer,
Queue<Long> personIdBuffer,
Queue<Long> companyIdBuffer,
Operation previousOperation,
long previousOperationActualStartTimeAsMilli,
long previousOperationRunDurationAsNano,
double state) {
Tuple4<Long, Long, Date, Date> tuple4 = accountIdBuffer.poll();
Tuple4<Long, Double, Date, Date> tuple4 = accountIdBuffer.poll();
if (null == tuple4) {
return null;
} else {
Expand Down Expand Up @@ -1157,14 +1157,14 @@ private LdbcSimpleQuery3Factory(ScheduledStartTimePolicy scheduledStartTimePolic

@Override
public Operation create(
Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer,
Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer,
Queue<Long> personIdBuffer,
Queue<Long> companyIdBuffer,
Operation previousOperation,
long previousOperationActualStartTimeAsMilli,
long previousOperationRunDurationAsNano,
double state) {
Tuple4<Long, Long, Date, Date> tuple4 = accountIdBuffer.poll();
Tuple4<Long, Double, Date, Date> tuple4 = accountIdBuffer.poll();
if (null == tuple4) {
return null;
} else {
Expand Down Expand Up @@ -1216,19 +1216,19 @@ private LdbcSimpleQuery4Factory(ScheduledStartTimePolicy scheduledStartTimePolic

@Override
public Operation create(
Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer,
Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer,
Queue<Long> personIdBuffer,
Queue<Long> companyIdBuffer,
Operation previousOperation,
long previousOperationActualStartTimeAsMilli,
long previousOperationRunDurationAsNano,
double state) {
Tuple4<Long, Long, Date, Date> tuple4 = accountIdBuffer.poll();
Tuple4<Long, Double, Date, Date> tuple4 = accountIdBuffer.poll();
if (null == tuple4) {
return null;
} else {
long id = tuple4._1();
long threshold = tuple4._2();
double threshold = tuple4._2();
Date startTime = tuple4._3();
Date endTime = tuple4._4();
Operation operation = new SimpleRead4(id, threshold, startTime, endTime);
Expand Down Expand Up @@ -1276,19 +1276,19 @@ private LdbcSimpleQuery5Factory(ScheduledStartTimePolicy scheduledStartTimePolic

@Override
public Operation create(
Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer,
Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer,
Queue<Long> personIdBuffer,
Queue<Long> companyIdBuffer,
Operation previousOperation,
long previousOperationActualStartTimeAsMilli,
long previousOperationRunDurationAsNano,
double state) {
Tuple4<Long, Long, Date, Date> tuple4 = accountIdBuffer.poll();
Tuple4<Long, Double, Date, Date> tuple4 = accountIdBuffer.poll();
if (null == tuple4) {
return null;
} else {
long id = tuple4._1();
long threshold = tuple4._2();
double threshold = tuple4._2();
Date startTime = tuple4._3();
Date endTime = tuple4._4();
Operation operation = new SimpleRead5(id, threshold, startTime, endTime);
Expand Down Expand Up @@ -1340,14 +1340,14 @@ private LdbcSimpleQuery6Factory(ScheduledStartTimePolicy scheduledStartTimePolic

@Override
public Operation create(
Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer,
Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer,
Queue<Long> personIdBuffer,
Queue<Long> companyIdBuffer,
Operation previousOperation,
long previousOperationActualStartTimeAsMilli,
long previousOperationRunDurationAsNano,
double state) {
Tuple4<Long, Long, Date, Date> tuple4 = accountIdBuffer.poll();
Tuple4<Long, Double, Date, Date> tuple4 = accountIdBuffer.poll();
if (null == tuple4) {
return null;
} else {
Expand Down
8 changes: 4 additions & 4 deletions ...nch/driver/workloads/transaction/LdbcFinBenchTransactionDbValidationParametersFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ private List<Operation> generateOperationsToInject(Operation operation) {
}


private void injectAccountSimples(List<Operation> operationsToInject, long accountId, long threshold,
private void injectAccountSimples(List<Operation> operationsToInject, long accountId, double threshold,
Date startTime, Date endTime) {
injectSimple1(operationsToInject, accountId);
injectSimple2(operationsToInject, accountId, startTime, endTime);
Expand All @@ -217,7 +217,7 @@ private void injectSimple2(List<Operation> operationsToInject, long accountId, D
}
}

private void injectSimple3(List<Operation> operationsToInject, long accountId, long threshold,
private void injectSimple3(List<Operation> operationsToInject, long accountId, double threshold,
Date startTime, Date endTime) {
if (enabledShortReadOperationTypes.contains(SimpleRead3.class)) {
operationsToInject.add(
Expand All @@ -226,7 +226,7 @@ private void injectSimple3(List<Operation> operationsToInject, long accountId, l
}
}

private void injectSimple4(List<Operation> operationsToInject, long accountId, long threshold,
private void injectSimple4(List<Operation> operationsToInject, long accountId, double threshold,
Date startTime, Date endTime) {
if (enabledShortReadOperationTypes.contains(SimpleRead4.class)) {
operationsToInject.add(
Expand All @@ -235,7 +235,7 @@ private void injectSimple4(List<Operation> operationsToInject, long accountId, l
}
}

private void injectSimple5(List<Operation> operationsToInject, long accountId, long threshold,
private void injectSimple5(List<Operation> operationsToInject, long accountId, double threshold,
Date startTime, Date endTime) {
if (enabledShortReadOperationTypes.contains(SimpleRead5.class)) {
operationsToInject.add(
Expand Down
4 changes: 2 additions & 2 deletions ...org/ldbcouncil/finbench/driver/workloads/transaction/LdbcFinBenchTransactionWorkload.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ private LdbcFinBenchSimpleReadGenerator getSimpleReadGenerator(boolean hasDbConn
RandomDataGeneratorFactory randomFactory = new RandomDataGeneratorFactory(42L);
double initialProbability = 1.0;

Queue<Tuple4<Long, Long, Date, Date>> accountIdBuffer;
Queue<Tuple4<Long, Double, Date, Date>> accountIdBuffer;
Queue<Long> personIdBuffer;
Queue<Long> companyIdBuffer;
LdbcFinBenchSimpleReadGenerator.ScheduledStartTimePolicy scheduledStartTimePolicy;
Expand All @@ -455,7 +455,7 @@ private LdbcFinBenchSimpleReadGenerator getSimpleReadGenerator(boolean hasDbConn
companyIdBuffer);
} else {
accountIdBuffer = LdbcFinBenchSimpleReadGenerator.constantTuple4Buffer(
new Tuple4<>(1L, 1L, new Date(), new Date()));
new Tuple4<>(1L, 1D, new Date(), new Date()));
personIdBuffer = LdbcFinBenchSimpleReadGenerator.constantBuffer(1);
companyIdBuffer = LdbcFinBenchSimpleReadGenerator.constantBuffer(1);
scheduledStartTimePolicy =
Expand Down
6 changes: 3 additions & 3 deletions ...ava/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead11Result.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
public class ComplexRead11Result {
public static final String SUM_LOAN_AMOUNT = "sumLoanAmount";
public static final String NUM_LOANS = "numLoans";
private final long sumLoanAmount;
private final double sumLoanAmount;
private final int numLoans;

public ComplexRead11Result(@JsonProperty(SUM_LOAN_AMOUNT) long sumLoanAmount,
public ComplexRead11Result(@JsonProperty(SUM_LOAN_AMOUNT) double sumLoanAmount,
@JsonProperty(NUM_LOANS) int numLoans) {
this.sumLoanAmount = sumLoanAmount;
this.numLoans = numLoans;
}

public long getSumLoanAmount() {
public double getSumLoanAmount() {
return sumLoanAmount;
}

Expand Down
6 changes: 3 additions & 3 deletions ...ava/org/ldbcouncil/finbench/driver/workloads/transaction/queries/ComplexRead12Result.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ public class ComplexRead12Result {
public static final String COMP_ACCOUNT_ID = "compAccountId";
public static final String SUM_EDGE2_AMOUNT = "sumEdge2Amount";
private final long compAccountId;
private final long sumEdge2Amount;
private final double sumEdge2Amount;

public ComplexRead12Result(@JsonProperty(COMP_ACCOUNT_ID) long compAccountId,
@JsonProperty(SUM_EDGE2_AMOUNT) long sumEdge2Amount) {
@JsonProperty(SUM_EDGE2_AMOUNT) double sumEdge2Amount) {
this.compAccountId = compAccountId;
this.sumEdge2Amount = sumEdge2Amount;
}
Expand All @@ -19,7 +19,7 @@ public long getCompAccountId() {
return compAccountId;
}

public long getSumEdge2Amount() {
public double getSumEdge2Amount() {
return sumEdge2Amount;
}

Expand Down
Loading

0 comments on commit a0fed9c

Please sign in to comment.