Merge remote-tracking branch 'upstream/master' into splitrun
Conflicts: core/src/main/java/com/yahoo/ycsb/workloads/CoreWorkload.java fixed conflict, fixed extra spaces and space between methods
Showing
- .travis.yml 4 additions, 3 deletions.travis.yml
- asynchbase/README.md 59 additions, 0 deletionsasynchbase/README.md
- asynchbase/pom.xml 105 additions, 0 deletionsasynchbase/pom.xml
- asynchbase/src/main/java/com/yahoo/ycsb/db/AsyncHBaseClient.java 409 additions, 0 deletions...ase/src/main/java/com/yahoo/ycsb/db/AsyncHBaseClient.java
- asynchbase/src/main/java/com/yahoo/ycsb/db/package-info.java 21 additions, 0 deletionsasynchbase/src/main/java/com/yahoo/ycsb/db/package-info.java
- asynchbase/src/test/java/com/google/common/base/Stopwatch.java 278 additions, 0 deletions...hbase/src/test/java/com/google/common/base/Stopwatch.java
- asynchbase/src/test/java/com/google/common/io/Closeables.java 104 additions, 0 deletions...chbase/src/test/java/com/google/common/io/Closeables.java
- asynchbase/src/test/java/com/google/common/io/LimitInputStream.java 104 additions, 0 deletions.../src/test/java/com/google/common/io/LimitInputStream.java
- asynchbase/src/test/java/com/yahoo/ycsb/db/AsyncHBaseTest.java 211 additions, 0 deletions...hbase/src/test/java/com/yahoo/ycsb/db/AsyncHBaseTest.java
- asynchbase/src/test/resources/hbase-site.xml 34 additions, 0 deletionsasynchbase/src/test/resources/hbase-site.xml
- asynchbase/src/test/resources/log4j.properties 28 additions, 0 deletionsasynchbase/src/test/resources/log4j.properties
- bin/ycsb 2 additions, 0 deletionsbin/ycsb
- core/src/main/java/com/yahoo/ycsb/Workload.java 15 additions, 15 deletionscore/src/main/java/com/yahoo/ycsb/Workload.java
- core/src/main/java/com/yahoo/ycsb/generator/IncrementingPrintableStringGenerator.java 389 additions, 0 deletions.../ycsb/generator/IncrementingPrintableStringGenerator.java
- core/src/main/java/com/yahoo/ycsb/generator/SequentialGenerator.java 8 additions, 5 deletions...in/java/com/yahoo/ycsb/generator/SequentialGenerator.java
- core/src/main/java/com/yahoo/ycsb/workloads/CoreWorkload.java 61 additions, 43 deletions.../src/main/java/com/yahoo/ycsb/workloads/CoreWorkload.java
- core/src/test/java/com/yahoo/ycsb/generator/TestIncrementingPrintableStringGenerator.java 130 additions, 0 deletions...b/generator/TestIncrementingPrintableStringGenerator.java
- core/src/test/java/com/yahoo/ycsb/workloads/TestCoreWorkload.java 70 additions, 0 deletions.../test/java/com/yahoo/ycsb/workloads/TestCoreWorkload.java
- couchbase2/README.md 23 additions, 1 deletioncouchbase2/README.md
- couchbase2/src/main/java/com/yahoo/ycsb/db/couchbase2/Couchbase2Client.java 27 additions, 0 deletions...n/java/com/yahoo/ycsb/db/couchbase2/Couchbase2Client.java
Loading
Please register or sign in to comment