diff --git a/bin/bindings.properties b/bin/bindings.properties index 9c2c2dcd89091189bd073236d3f6814ab98046d3..6486b0b5ac4fa23b32a3aa3dedb7714af97befb6 100644 --- a/bin/bindings.properties +++ b/bin/bindings.properties @@ -46,7 +46,6 @@ elasticsearch5-rest:com.yahoo.ycsb.db.elasticsearch5.ElasticsearchRestClient geode:com.yahoo.ycsb.db.GeodeClient googlebigtable:com.yahoo.ycsb.db.GoogleBigtableClient googledatastore:com.yahoo.ycsb.db.GoogleDatastoreClient -hbase094:com.yahoo.ycsb.db.HBaseClient hbase098:com.yahoo.ycsb.db.HBaseClient hbase10:com.yahoo.ycsb.db.HBaseClient10 hbase12:com.yahoo.ycsb.db.hbase12.HBaseClient12 diff --git a/bin/ycsb b/bin/ycsb index 47a336d77f885503b7ca2da788a0d5865625b38d..d84f9ec095f414d684d2d7738e2a527405a2d7d0 100755 --- a/bin/ycsb +++ b/bin/ycsb @@ -71,7 +71,6 @@ DATABASES = { "geode" : "com.yahoo.ycsb.db.GeodeClient", "googlebigtable" : "com.yahoo.ycsb.db.GoogleBigtableClient", "googledatastore" : "com.yahoo.ycsb.db.GoogleDatastoreClient", - "hbase094" : "com.yahoo.ycsb.db.HBaseClient", "hbase098" : "com.yahoo.ycsb.db.HBaseClient", "hbase10" : "com.yahoo.ycsb.db.HBaseClient10", "hbase12" : "com.yahoo.ycsb.db.hbase12.HBaseClient12", diff --git a/distribution/pom.xml b/distribution/pom.xml index bc5932a4565288919d04a21172f3fc9271c03021..8d477fce119e66861fdbf7624761b34db115981f 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -124,11 +124,6 @@ LICENSE file. <artifactId>googlebigtable-binding</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>com.yahoo.ycsb</groupId> - <artifactId>hbase094-binding</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>com.yahoo.ycsb</groupId> <artifactId>hbase098-binding</artifactId> diff --git a/hbase094/README.md b/hbase094/README.md deleted file mode 100644 index 3df8264cfd89acc63bf07b929a5c4683d534f596..0000000000000000000000000000000000000000 --- a/hbase094/README.md +++ /dev/null @@ -1,23 +0,0 @@ -<!-- -Copyright (c) 2015 YCSB contributors. All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); you -may not use this file except in compliance with the License. You -may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -implied. See the License for the specific language governing -permissions and limitations under the License. See accompanying -LICENSE file. ---> - -# HBase (0.94.x) Driver for YCSB -This driver is a binding for the YCSB facilities to operate against a HBase 0.94.x Server cluster. It may also work against 0.92.x -To run against an HBase 0.98.x cluster, use the `hbase098` binding. -To run against an HBase >= 1.0 cluster, use the `hbase10` binding. - -See `hbase098/README.md` for configuration details. diff --git a/hbase094/pom.xml b/hbase094/pom.xml deleted file mode 100644 index 0c865763be8b7a90bbe9ec68293d104fc1024d1a..0000000000000000000000000000000000000000 --- a/hbase094/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Copyright (c) 2012 - 2015 YCSB contributors. All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); you -may not use this file except in compliance with the License. You -may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -implied. See the License for the specific language governing -permissions and limitations under the License. See accompanying -LICENSE file. ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>com.yahoo.ycsb</groupId> - <artifactId>binding-parent</artifactId> - <version>0.14.0-SNAPSHOT</version> - <relativePath>../binding-parent/</relativePath> - </parent> - - <artifactId>hbase094-binding</artifactId> - <name>HBase 0.94.x DB Binding</name> - - <dependencies> - <!-- This binding is identical to the HBase 0.98, other than dependencies. --> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <version>${hbase094.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>com.yahoo.ycsb</groupId> - <artifactId>hbase098-binding</artifactId> - <version>${project.version}</version> - <exclusions> - <!-- HBase 0.98.0 depends on hbase-client, HBase 0.94.0 on hbase. - Override all dependencies. --> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.7.12</version> - </dependency> - <dependency> - <groupId>com.yahoo.ycsb</groupId> - <artifactId>core</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> -</project> diff --git a/hbase098/README.md b/hbase098/README.md index 83c3c7a084743435736c88c6e840cc44e9829690..aac26237b0288f7c847b89bd8a46e6ab06cc48dc 100644 --- a/hbase098/README.md +++ b/hbase098/README.md @@ -17,7 +17,6 @@ LICENSE file. # HBase (0.98.x) Driver for YCSB This driver is a binding for the YCSB facilities to operate against a HBase 0.98.x Server cluster. -To run against an HBase 0.94.x cluster, use the `hbase094` binding. To run against an HBase >= 1.0 cluster, use the `hbase10` binding. ## Quickstart @@ -79,4 +78,4 @@ Following options can be configurable using `-p`. * `keytab`: The Kerberos keytab file name and location can be passed through this property. * `writebuffersize`: The maximum amount, in bytes, of data to buffer on the client side before a flush is forced. The default is 12MB. -Additional HBase settings should be provided in the `hbase-site.xml` file located in your `/HBASE-HOME-DIR/conf` directory. Typically this will be `/etc/hbase/conf`. \ No newline at end of file +Additional HBase settings should be provided in the `hbase-site.xml` file located in your `/HBASE-HOME-DIR/conf` directory. Typically this will be `/etc/hbase/conf`. diff --git a/hbase098/src/main/java/com/yahoo/ycsb/db/package-info.java b/hbase098/src/main/java/com/yahoo/ycsb/db/package-info.java index a0c1469fb5f9b5eb3157ec3e4928140e8789b129..b77e194327e512335e108ba65b7a5b287d8d40a1 100644 --- a/hbase098/src/main/java/com/yahoo/ycsb/db/package-info.java +++ b/hbase098/src/main/java/com/yahoo/ycsb/db/package-info.java @@ -17,7 +17,6 @@ /** * The YCSB binding for <a href= * "https://issues.apache.org/jira/browse/HBASE/fixforversion/12333364/">HBase - * 0.98.X</a>. The classes in this package are also used for the HBase 0.94.X - * but with different dependencies via the hbase094 binding. + * 0.98.X</a>. */ package com.yahoo.ycsb.db; diff --git a/hbase10/README.md b/hbase10/README.md index dd01249edbf169b6ab112af34c1a157dad4da067..611d3a6f821579a74a50b231b236049aea90fcb1 100644 --- a/hbase10/README.md +++ b/hbase10/README.md @@ -17,7 +17,6 @@ LICENSE file. # HBase (1.0.x) Driver for YCSB This driver is a binding for the YCSB facilities to operate against a HBase 1.0.x Server cluster or Google's hosted Bigtable. -To run against an HBase 0.94.x cluster, use the `hbase094` binding. To run against an HBase 0.98.x cluster, use the `hbase098` binding. See `hbase098/README.md` for a quickstart to setup HBase for load testing and common configuration details. @@ -113,4 +112,4 @@ The `load` step only executes inserts into the datastore. After loading data, ru ``` bin/ycsb run hbase10 -p columnfamily=cf -jvm-args='-Xbootclasspath/p:<PATH_TO_ALPN_JAR>' -P workloads/workloada -``` \ No newline at end of file +``` diff --git a/pom.xml b/pom.xml index 957e7b62b9e5d0e08f26f5fc3469ef32cabdfa06..1fd0cb36ba9a68cc03e9ebe04c4408d6cb5069a7 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,6 @@ LICENSE file. <maven.assembly.version>2.5.5</maven.assembly.version> <maven.dependency.version>2.10</maven.dependency.version> <asynchbase.version>1.7.1</asynchbase.version> - <hbase094.version>0.94.27</hbase094.version> <hbase098.version>0.98.14-hadoop2</hbase098.version> <hbase10.version>1.0.2</hbase10.version> <hbase12.version>1.2.5</hbase12.version> @@ -128,7 +127,6 @@ LICENSE file. <module>geode</module> <module>googlebigtable</module> <module>googledatastore</module> - <module>hbase094</module> <module>hbase098</module> <module>hbase10</module> <module>hbase12</module>