From 4a6980c083eb55d7f803a77e80d924b3c1f68a1f Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Mon, 23 Nov 2015 16:17:58 -0800 Subject: [PATCH] HBASE-14858 Clean up so core is ready for development on a recent version of c++ --- hbase-native-client/async/CMakeLists.txt | 32 ------- hbase-native-client/async/get-test.cc | 59 ------------- hbase-native-client/async/hbase_admin.cc | 57 ------------ hbase-native-client/async/hbase_admin.h | 69 --------------- hbase-native-client/async/hbase_client.cc | 47 ---------- hbase-native-client/async/hbase_client.h | 60 ------------- hbase-native-client/async/hbase_connection.cc | 37 -------- hbase-native-client/async/hbase_connection.h | 52 ----------- hbase-native-client/async/hbase_errno.h | 23 ----- hbase-native-client/async/hbase_get.cc | 61 ------------- hbase-native-client/async/hbase_get.h | 73 ---------------- hbase-native-client/async/hbase_mutations.cc | 111 ------------------------ hbase-native-client/async/hbase_mutations.h | 119 -------------------------- hbase-native-client/async/hbase_result.cc | 37 -------- hbase-native-client/async/hbase_result.h | 44 ---------- hbase-native-client/async/hbase_scanner.cc | 59 ------------- hbase-native-client/async/hbase_scanner.h | 80 ----------------- hbase-native-client/async/mutations-test.cc | 102 ---------------------- hbase-native-client/core/admin.h | 5 +- hbase-native-client/core/client.h | 4 +- hbase-native-client/core/connection.h | 5 +- hbase-native-client/core/connection_attr.h | 5 +- hbase-native-client/core/delete.h | 4 +- hbase-native-client/core/get.h | 6 +- hbase-native-client/core/hbase_macros.h | 5 +- hbase-native-client/core/mutation.h | 4 +- hbase-native-client/core/put.h | 4 +- hbase-native-client/core/scanner.h | 4 +- hbase-native-client/sync/CMakeLists.txt | 24 ------ hbase-native-client/sync/hbase_admin.cc | 51 ----------- hbase-native-client/sync/hbase_admin.h | 61 ------------- hbase-native-client/sync/hbase_connection.cc | 37 -------- hbase-native-client/sync/hbase_connection.h | 52 ----------- 33 files changed, 13 insertions(+), 1380 deletions(-) delete mode 100644 hbase-native-client/async/CMakeLists.txt delete mode 100644 hbase-native-client/async/get-test.cc delete mode 100644 hbase-native-client/async/hbase_admin.cc delete mode 100644 hbase-native-client/async/hbase_admin.h delete mode 100644 hbase-native-client/async/hbase_client.cc delete mode 100644 hbase-native-client/async/hbase_client.h delete mode 100644 hbase-native-client/async/hbase_connection.cc delete mode 100644 hbase-native-client/async/hbase_connection.h delete mode 100644 hbase-native-client/async/hbase_errno.h delete mode 100644 hbase-native-client/async/hbase_get.cc delete mode 100644 hbase-native-client/async/hbase_get.h delete mode 100644 hbase-native-client/async/hbase_mutations.cc delete mode 100644 hbase-native-client/async/hbase_mutations.h delete mode 100644 hbase-native-client/async/hbase_result.cc delete mode 100644 hbase-native-client/async/hbase_result.h delete mode 100644 hbase-native-client/async/hbase_scanner.cc delete mode 100644 hbase-native-client/async/hbase_scanner.h delete mode 100644 hbase-native-client/async/mutations-test.cc delete mode 100644 hbase-native-client/sync/CMakeLists.txt delete mode 100644 hbase-native-client/sync/hbase_admin.cc delete mode 100644 hbase-native-client/sync/hbase_admin.h delete mode 100644 hbase-native-client/sync/hbase_connection.cc delete mode 100644 hbase-native-client/sync/hbase_connection.h diff --git a/hbase-native-client/async/CMakeLists.txt b/hbase-native-client/async/CMakeLists.txt deleted file mode 100644 index b2ed461..0000000 --- a/hbase-native-client/async/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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. - -set( ASYNC_SRC - hbase_admin.cc - hbase_client.cc - hbase_connection.cc - hbase_get.cc - hbase_mutations.cc - hbase_result.cc - hbase_scanner.cc -) - - -add_library(hasync OBJECT ${ASYNC_SRC}) - -ADD_HBASE_ASYNC_TEST(mutations-test) -ADD_HBASE_ASYNC_TEST(get-test) diff --git a/hbase-native-client/async/get-test.cc b/hbase-native-client/async/get-test.cc deleted file mode 100644 index df94ce2..0000000 --- a/hbase-native-client/async/get-test.cc +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#include - -#include "gtest/gtest.h" -#include "async/hbase_get.h" -#include "async/hbase_client.h" - - -pthread_cond_t cv; -pthread_mutex_t mutex; - -TEST(GetTest, TestPut) { - char tn[] = "T1"; - hb_byte_t row[] = "ROW"; - - hb_client_t client = NULL; - hb_get_t get = NULL; - int32_t s1 = -1; - - pthread_cond_init(&cv, NULL); - pthread_mutex_init(&mutex, NULL); - - s1 = hb_client_create(&client, NULL); - EXPECT_EQ(0, s1); - - s1 = hb_get_create(&get); - EXPECT_EQ(0, s1); - - hb_get_set_table(get, tn, 2); - hb_get_set_row(get, row, 3); - - /* - * TODO: - * This is currently a NO-OP as there is no CB. - */ - hb_get_send(client, get, NULL, NULL); - - hb_client_destroy(client, NULL, NULL); - - EXPECT_EQ(0, s1); -} diff --git a/hbase-native-client/async/hbase_admin.cc b/hbase-native-client/async/hbase_admin.cc deleted file mode 100644 index 17ff2a7..0000000 --- a/hbase-native-client/async/hbase_admin.cc +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#include "async/hbase_admin.h" - -#include -#include - -#include "core/admin.h" -#include "async/hbase_connection.h" - -int32_t hb_admin_create(hb_admin_t* admin_ptr, - hb_connection_t connection) { - (*admin_ptr) = reinterpret_cast(new Admin()); - return 0; -} - -/* - * Disconnect the admin releasing any internal objects - * or connections created in the background. - */ -int32_t hb_admin_destroy(hb_admin_t admin, - hb_admin_disconnection_cb cb, void * extra) { - if (cb) - cb(0, admin, extra); - free(admin); - return 0; -} - -/* - * See if a table exists. - */ -int32_t hb_admin_table_exists(hb_admin_t admin, - char * name_space, size_t name_space_length, - char * table, size_t table_length, - hb_admin_table_exists_cb cb, void * extra) { - if (cb) - cb(0, admin, name_space, name_space_length, - table, table_length, true, extra); - return 0; -} diff --git a/hbase-native-client/async/hbase_admin.h b/hbase-native-client/async/hbase_admin.h deleted file mode 100644 index f03a83f..0000000 --- a/hbase-native-client/async/hbase_admin.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#ifndef ASYNC_HBASE_ADMIN_H_ -#define ASYNC_HBASE_ADMIN_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include - -#include "core/hbase_macros.h" -#include "async/hbase_connection.h" - - -typedef void (* hb_admin_disconnection_cb)( int32_t status, - hb_admin_t admin, void * extra); -typedef void (* hb_admin_table_exists_cb)(int32_t status, hb_admin_t admin, - char * name_space, size_t name_space_length, - char * table, size_t table_length, bool exsists, void * extra); - -/** - * Create a new hb_admin. - * All fields are initialized to the defaults. If you want to set - * connection or other properties, set those before calling any - * RPC functions. - */ -HBASE_API int32_t hb_admin_create(hb_admin_t* admin_ptr, - hb_connection_t connection); - -/* - * Disconnect the admin releasing any internal objects - * or connections created in the background. - */ -HBASE_API int32_t hb_admin_destroy(hb_admin_t admin, - hb_admin_disconnection_cb cb, void * extra); - -/* - * See if a table exists. - */ -HBASE_API int32_t hb_admin_table_exists(hb_admin_t admin, - char * name_space, size_t name_space_length, - char * table, size_t table_length, - hb_admin_table_exists_cb cb, void * extra); - - -#ifdef __cplusplus -} // extern "C" -#endif // __cplusplus - -#endif // ASYNC_HBASE_ADMIN_H_ diff --git a/hbase-native-client/async/hbase_client.cc b/hbase-native-client/async/hbase_client.cc deleted file mode 100644 index 98e3dbf..0000000 --- a/hbase-native-client/async/hbase_client.cc +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#include "async/hbase_client.h" - -#include -#include -#include - -#include "core/client.h" -#include "async/hbase_connection.h" - -int32_t hb_client_create(hb_client_t* client_ptr, - hb_connection_t connection) { - (*client_ptr) = reinterpret_cast(new Client()); - if (client_ptr == NULL) - return -1; // TODO(eclark): setup the errno file. - return 0; -} - -int32_t hb_client_destroy(hb_client_t client, - hb_client_disconnection_cb cb, void * extra) { - if (client == NULL) - return -2; - if (cb) { - cb(0, client, extra); - } - free(client); - return 0; -} - diff --git a/hbase-native-client/async/hbase_client.h b/hbase-native-client/async/hbase_client.h deleted file mode 100644 index 34c3d98..0000000 --- a/hbase-native-client/async/hbase_client.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#ifndef ASYNC_HBASE_CLIENT_H_ -#define ASYNC_HBASE_CLIENT_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "core/hbase_macros.h" -#include "core/hbase_types.h" - -/* - * Client disconnection callback typedef - * - * This is called after the connections are closed, but just - * before the client is freed. - */ -typedef void (* hb_client_disconnection_cb)( int32_t status, - hb_client_t client, void * extra); - -/** - * Create an hb_client_t. - * - * If connection is null then all defaults will be used. - */ -HBASE_API int32_t hb_client_create(hb_client_t * client_ptr, - hb_connection_t connection); - -/* - * Disconnect the client releasing any internal objects - * or connections created in the background. - */ -HBASE_API int32_t hb_client_destroy(hb_client_t client, - hb_client_disconnection_cb cb, void * extra); - -#ifdef __cplusplus -} // extern "C" -#endif // __cplusplus - -#endif // ASYNC_HBASE_CLIENT_H_ - - diff --git a/hbase-native-client/async/hbase_connection.cc b/hbase-native-client/async/hbase_connection.cc deleted file mode 100644 index 57fa4f5..0000000 --- a/hbase-native-client/async/hbase_connection.cc +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#include "async/hbase_connection.h" - -#include "core/connection.h" -#include "core/hbase_types.h" - -extern "C" { -int32_t hb_connection_create(hb_connection_t * connection_ptr, - hb_connection_attr_t connection_attr) { - (*connection_ptr) = reinterpret_cast(new Connection()); - if ((*connection_ptr) == NULL) - return -1; - return 0; -} -int32_t hb_connection_destroy(hb_connection_t connection) { - free(connection); - return 0; -} -} // extern "C" diff --git a/hbase-native-client/async/hbase_connection.h b/hbase-native-client/async/hbase_connection.h deleted file mode 100644 index 343f36c..0000000 --- a/hbase-native-client/async/hbase_connection.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#ifndef ASYNC_HBASE_CONNECTION_H_ -#define ASYNC_HBASE_CONNECTION_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "core/hbase_macros.h" -#include "core/hbase_types.h" -#include "core/hbase_connection_attr.h" - -#include - -/** - * Create an hb_connection. - * - * if connection_attr is null everything will be left as default - */ -HBASE_API int32_t hb_connection_create(hb_connection_t * connection_ptr, - hb_connection_attr_t connection_attr); - -/** - * Destroy the connection and free all resources allocated at creation - * time. - */ -HBASE_API int32_t hb_connection_destroy(hb_connection_t connection); - -#ifdef __cplusplus -} // extern "C" -#endif // __cplusplus - -#endif // ASYNC_HBASE_CONNECTION_H_ - diff --git a/hbase-native-client/async/hbase_errno.h b/hbase-native-client/async/hbase_errno.h deleted file mode 100644 index 1698bbd..0000000 --- a/hbase-native-client/async/hbase_errno.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#ifndef ASYNC_HBASE_ERRNO_H_ -#define ASYNC_HBASE_ERRNO_H_ - -#endif // ASYNC_HBASE_ERRNO_H_ diff --git a/hbase-native-client/async/hbase_get.cc b/hbase-native-client/async/hbase_get.cc deleted file mode 100644 index 32048d8..0000000 --- a/hbase-native-client/async/hbase_get.cc +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#include "async/hbase_get.h" - -#include -#include - -#include "core/get.h" - -int32_t hb_get_create(hb_get_t * get_ptr) { - (*get_ptr) = reinterpret_cast(new Get()); - if ((*get_ptr) == NULL) { - return -1; - } - return 0; -} - -int32_t hb_get_destroy(hb_get_t get) { - free(get); - return 0; -} - -int32_t hb_get_set_row(hb_get_t get, unsigned char * row, - size_t row_length) { - return 0; -} - -int32_t hb_get_set_table(hb_get_t get, - char * table, size_t table_length) { - return 0; -} - -int32_t hb_get_set_namespace(hb_get_t get, - char * name_space, size_t name_space_length) { - return 0; -} - -int32_t hb_get_send(hb_client_t client, - hb_get_t get, hb_get_cb cb, void * extra) { - if (cb) { - cb(0, client, get, NULL, extra); - } - return 0; -} diff --git a/hbase-native-client/async/hbase_get.h b/hbase-native-client/async/hbase_get.h deleted file mode 100644 index 7d91c08..0000000 --- a/hbase-native-client/async/hbase_get.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#ifndef ASYNC_HBASE_GET_H_ -#define ASYNC_HBASE_GET_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "core/hbase_macros.h" -#include "core/hbase_types.h" - -/** - * Allocate a new get structure. - * Ownership passes to the caller. - */ -HBASE_API int32_t hb_get_create(hb_get_t * get_ptr); - -/** - * Destroy and free a get structure. - */ -HBASE_API int32_t hb_get_destroy(hb_get_t get); - -/** - * set the row of this get. - */ -HBASE_API int32_t hb_get_set_row(hb_get_t get, hb_byte_t * row, - size_t row_length); - -/** - * Set the table. - */ -HBASE_API int32_t hb_get_set_table(hb_get_t get, - char * table, size_t table_length); - -/** - * Set the namespace this get is targeting. - */ -HBASE_API int32_t hb_get_set_namespace(hb_get_t get, - char * name_space, size_t name_space_length); - -/* - * get call back typedef. - */ -typedef void (* hb_get_cb)(int32_t status, hb_client_t client, - hb_get_t get, hb_result_t results, void * extra); - -HBASE_API int32_t hb_get_send(hb_client_t client, - hb_get_t get, hb_get_cb cb, void * extra); - - -#ifdef __cplusplus -} // extern "C" -#endif // __cplusplus - -#endif // ASYNC_HBASE_GET_H_ diff --git a/hbase-native-client/async/hbase_mutations.cc b/hbase-native-client/async/hbase_mutations.cc deleted file mode 100644 index 2456dc0..0000000 --- a/hbase-native-client/async/hbase_mutations.cc +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#include "async/hbase_mutations.h" - -#include - -#include "core/hbase_types.h" -#include "core/mutation.h" -#include "core/put.h" -#include "core/delete.h" - -#include "async/hbase_result.h" - -extern "C" { -int32_t hb_put_create(hb_put_t* put_ptr) { - (*put_ptr) = reinterpret_cast(new Put()); - return 0; -} - -int32_t hb_delete_create(hb_delete_t * delete_ptr) { - (*delete_ptr) = reinterpret_cast(new Delete()); - return 0; -} - -int32_t hb_increment_create(hb_increment_t * increment_ptr) { - return 0; -} - -int32_t hb_append_create(hb_append_t * append_ptr) { - return 0; -} - -int32_t hb_mutation_destroy(hb_mutation_t mutation) { - return 0; -} - -HBASE_API int32_t hb_mutation_set_namespace(hb_mutation_t mutation, - char * name_space, size_t name_space_length) { - Mutation * m = reinterpret_cast(mutation); - m->set_namespace(name_space, name_space_length); - return 0; -} - -HBASE_API int32_t hb_mutation_set_table(hb_mutation_t mutation, - char * table, size_t table_length) { - Mutation * m = reinterpret_cast(mutation); - m->set_namespace(table, table_length); - return 0; -} - -int32_t hb_mutation_set_row(hb_mutation_t mutation, - unsigned char * rk, size_t row_length) { - Mutation * m = reinterpret_cast(mutation); - m->set_row(rk, row_length); - return 0; -} - -int32_t hb_mutation_set_durability(hb_mutation_t mutation, - hb_durability_type durability) { - Mutation * m = reinterpret_cast(mutation); - m->set_durability(durability); - return 0; -} - -int32_t hb_put_add_cell(hb_put_t put, hb_cell_t * cell) { - return 0; -} - -int32_t hb_delete_add_col(hb_increment_t incr, - unsigned char * family, size_t family_length, - unsigned char * qual, size_t qual_length) { - return 0; -} - -int32_t hb_increment_add_value(hb_increment_t incr, - unsigned char * family, size_t family_length, - unsigned char * qual, size_t qual_length, - int64_t ammount) { - return 0; -} - -int32_t hb_append_add_cell(hb_append_t put, hb_cell_t * cell) { - return 0; -} - -int32_t hb_mutation_send(hb_client_t client, - hb_mutation_t mutation, hb_mutation_cb cb, - void * extra) { - if (cb) { - cb(0, client, mutation, NULL, extra); - } - return 0; -} -} // extern "C" diff --git a/hbase-native-client/async/hbase_mutations.h b/hbase-native-client/async/hbase_mutations.h deleted file mode 100644 index 4000390..0000000 --- a/hbase-native-client/async/hbase_mutations.h +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#ifndef ASYNC_HBASE_MUTATIONS_H_ -#define ASYNC_HBASE_MUTATIONS_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "core/hbase_types.h" -#include "async/hbase_result.h" - -// Creation methods - -/** - * Create a put. - * Ownership passes to the caller. - */ -HBASE_API int32_t hb_put_create(hb_put_t * put_ptr); - -/** - * Create a delete - * Ownership passes to the caller. - */ -HBASE_API int32_t hb_delete_create(hb_delete_t * delete_ptr); - -/** - * Create an increment - * Ownership passes to the caller. - */ -HBASE_API int32_t hb_increment_create(hb_increment_t * increment_ptr); - -/** - * Create an append - * Ownership passes to the caller. - */ -HBASE_API int32_t hb_append_create(hb_append_t * append_ptr); - -/** - * Destroy the mutation. - * All internal structures are cleaned up. However any backing - * data structures passed in by the user are not cleaned up. - */ -HBASE_API int32_t hb_mutation_destroy(hb_mutation_t mutation); - -// Shared setters. -HBASE_API int32_t hb_mutation_set_namespace(hb_mutation_t mutation, - char * name_space, size_t name_space_length); -HBASE_API int32_t hb_mutation_set_table(hb_mutation_t mutation, - char * table, size_t table_length); -HBASE_API int32_t hb_mutation_set_row(hb_mutation_t mutation, - unsigned char * rk, size_t row_length); -HBASE_API int32_t hb_mutation_set_durability(hb_mutation_t mutation, - hb_durability_type durability); - -// Put Setters etc. -HBASE_API int32_t hb_put_add_cell(hb_put_t put, hb_cell_t * cell); - -// Delete -HBASE_API int32_t hb_delete_add_col(hb_increment_t incr, - unsigned char * family, size_t family_length, - unsigned char * qual, size_t qual_length); - -// Increment -HBASE_API int32_t hb_increment_add_value(hb_increment_t incr, - unsigned char * family, size_t family_length, - unsigned char * qual, size_t qual_length, - int64_t ammount); - -// Append -HBASE_API int32_t hb_append_add_cell(hb_append_t put, hb_cell_t * cell); - -// Now that the mutations are created and populated -// The real meat of the client is below. - -/* - * mutation call back typedef - */ -typedef void (* hb_mutation_cb)(int32_t status, - hb_client_t client, hb_mutation_t mutation, - hb_result_t result, void * extra); - -/* - * Queue a single mutation. This mutation will be - * sent out in the background and can be batched with - * other requests destined for the same server. - * - * The call back will be executed after the response - * is received from the RegionServer. Even if the - * mutation was batched with other requests, - * the call back will be invoked for every mutation - * individually. - */ -HBASE_API int32_t hb_mutation_send(hb_client_t client, - hb_mutation_t mutation, hb_mutation_cb cb, - void * extra); - -#ifdef __cplusplus -} // extern "C" -#endif // __cplusplus - -#endif // ASYNC_HBASE_MUTATIONS_H_ diff --git a/hbase-native-client/async/hbase_result.cc b/hbase-native-client/async/hbase_result.cc deleted file mode 100644 index 9351270..0000000 --- a/hbase-native-client/async/hbase_result.cc +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#include "async/hbase_result.h" - -#include "core/hbase_types.h" - -int32_t hb_result_get_cells(hb_result_t result, - hb_cell_t ** cell_ptr, size_t * num_cells) { - return 0; -} - -int32_t hb_result_get_table(hb_result_t result, - char ** table, size_t * table_length) { - return 0; -} - -int32_t hb_result_get_namespace(hb_result_t result, - char ** name_space, size_t * name_space_length) { - return 0; -} diff --git a/hbase-native-client/async/hbase_result.h b/hbase-native-client/async/hbase_result.h deleted file mode 100644 index eecbbb3..0000000 --- a/hbase-native-client/async/hbase_result.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#ifndef ASYNC_HBASE_RESULT_H_ -#define ASYNC_HBASE_RESULT_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "core/hbase_macros.h" -#include "core/hbase_types.h" - -HBASE_API int32_t hb_result_destroy(hb_result_t result); - -HBASE_API int32_t hb_result_get_cells(hb_result_t result, - hb_cell_t ** cell_ptr, size_t * num_cells); - -HBASE_API int32_t hb_result_get_table(hb_result_t result, - char ** table, size_t * table_length); -HBASE_API int32_t hb_result_get_namespace(hb_result_t result, - char ** name_space, size_t * name_space_length); - -#ifdef __cplusplus -} // extern "C" -#endif // __cplusplus - -#endif // ASYNC_HBASE_RESULT_H_ diff --git a/hbase-native-client/async/hbase_scanner.cc b/hbase-native-client/async/hbase_scanner.cc deleted file mode 100644 index 5a8e555..0000000 --- a/hbase-native-client/async/hbase_scanner.cc +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ -#include "async/hbase_scanner.h" - -#include - -#include "core/hbase_types.h" -#include "core/scanner.h" - -int32_t hb_scanner_create(hb_scanner_t * scanner_ptr) { - (*scanner_ptr) = reinterpret_cast(new Scanner()); - return (*scanner_ptr != NULL)?0:1; -} - -HBASE_API int32_t hb_scanner_set_table(hb_scanner_t scanner, - char * table, size_t table_length) { - return 0; -} - -HBASE_API int32_t hb_scanner_set_namespace(hb_scanner_t scanner, - char * name_space, size_t name_space_length) { - return 0; -} - -int32_t hb_scanner_set_start_row(hb_scanner_t scanner, - unsigned char * start_row, size_t start_row_length) { - return 0; -} - -int32_t hb_scanner_set_end_row(hb_scanner_t scanner, - unsigned char * end_row, size_t end_row_length) { - return 0; -} - -int32_t hb_scanner_set_cache_size(hb_scanner_t scanner, - size_t cache_size) { - return 0; -} - -int32_t hb_scanner_set_num_versions(hb_scanner_t scanner, - int8_t num_versions) { - return 0; -} diff --git a/hbase-native-client/async/hbase_scanner.h b/hbase-native-client/async/hbase_scanner.h deleted file mode 100644 index cd3f544..0000000 --- a/hbase-native-client/async/hbase_scanner.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#ifndef ASYNC_HBASE_SCANNER_H_ -#define ASYNC_HBASE_SCANNER_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "async/hbase_result.h" -#include "core/hbase_types.h" - -HBASE_API int32_t hb_scanner_create(hb_scanner_t * scanner_ptr); - -HBASE_API int32_t hb_scanner_set_table(hb_scanner_t scanner, - char * table, size_t table_length); -HBASE_API int32_t hb_scanner_set_namespace(hb_scanner_t scanner, - char * name_space, size_t name_space_length); - -HBASE_API int32_t hb_scanner_set_start_row(hb_scanner_t scanner, - unsigned char * start_row, size_t start_row_length); -HBASE_API int32_t hb_scanner_set_end_row(hb_scanner_t scanner, - unsigned char * end_row, size_t end_row_length); - -HBASE_API int32_t hb_scanner_set_cache_size(hb_scanner_t scanner, - size_t cache_size); -HBASE_API int32_t hb_scanner_set_batch_size(hb_scanner_t scanner, - size_t batch_size); -HBASE_API int32_t hb_scanner_set_num_versions(hb_scanner_t scanner, - int8_t num_versions); - -/* - * Scanner call back typedef. - * - * This will be called when initinalization of the scanner - * is complete. It will also be called when scanner next - * returns results. - */ -typedef void (* hb_scanner_cb)(int32_t status, - hb_client_t client, - hb_scanner_t scanner, - hb_result_t results, - size_t num_results, - void * extra); -/* - * Get the next results from the scanner - */ -HBASE_API int32_t hb_scanner_next(hb_client_t client, - hb_scanner_t scanner, hb_scanner_cb cb, void * extra); - -/* - * Close the scanner releasing any local and server side - * resources held. The call back is fired just before the - * scanner's memory is freed. - */ -HBASE_API int32_t hb_scanner_destroy(hb_client_t client, - hb_scanner_t scanner, hb_scanner_cb cb, void * extra); - -#ifdef __cplusplus -} // extern "C" -#endif // __cplusplus - -#endif // ASYNC_HBASE_SCANNER_H_ diff --git a/hbase-native-client/async/mutations-test.cc b/hbase-native-client/async/mutations-test.cc deleted file mode 100644 index be5898e..0000000 --- a/hbase-native-client/async/mutations-test.cc +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#include - -#include "gtest/gtest.h" -#include "async/hbase_mutations.h" -#include "async/hbase_client.h" - -pthread_cond_t cv; -pthread_mutex_t mutex; - -bool sent = false; - -TEST(ClientTest, EasyTest) { - EXPECT_EQ(1, 1); -} - -void mutate_cb(int32_t status, - hb_client_t client, hb_mutation_t mutation, - hb_result_t result, void * extra) { - - // Test Stuff. - EXPECT_EQ(status, 0); - EXPECT_TRUE(client != NULL); - EXPECT_TRUE(mutation != NULL); - - pthread_mutex_lock(&mutex); - sent = true; - pthread_cond_signal(&cv); - pthread_mutex_unlock(&mutex); -} - -void wait_send() { - pthread_mutex_lock(&mutex); - while (!sent) { - pthread_cond_wait(&cv, &mutex); - } - pthread_mutex_unlock(&mutex); -} - -TEST(MutationTest, TestPut) { - char tn[] = "T1"; - hb_byte_t row[] = "ROW"; - char fam[] = "D"; - hb_byte_t qual[] = "QUAL"; - hb_byte_t data[] = "Z"; - - hb_client_t client = NULL; - hb_put_t put = NULL; - hb_cell_t cell; - - cell.family = fam; - cell.family_length = 1; - - cell.qual = qual; - cell.qual_length = 4; - - cell.value = data; - cell.value_length = 1; - - int32_t status = -1; - - status = hb_client_create(&client, NULL); - EXPECT_EQ(0, status); - - hb_put_create(&put); - hb_mutation_set_table((hb_mutation_t) put, tn, 2); - hb_mutation_set_row((hb_mutation_t) put, row, 3); - hb_put_add_cell(put, &cell); - - pthread_cond_init(&cv, NULL); - pthread_mutex_init(&mutex, NULL); - - status = hb_mutation_send(client, (hb_mutation_t) put, &mutate_cb, NULL); - EXPECT_EQ(0, status); - - // Now wait a while for things to send. - wait_send(); - EXPECT_EQ(true, sent); - - hb_mutation_destroy((hb_mutation_t *) put); - hb_client_destroy(client, NULL, NULL); - - EXPECT_EQ(0, status); -} diff --git a/hbase-native-client/core/admin.h b/hbase-native-client/core/admin.h index 101e9d7..775181c 100644 --- a/hbase-native-client/core/admin.h +++ b/hbase-native-client/core/admin.h @@ -17,7 +17,6 @@ * */ -#ifndef CORE_ADMIN_H_ -#define CORE_ADMIN_H_ +#pragma once + class Admin {}; -#endif // CORE_ADMIN_H_ diff --git a/hbase-native-client/core/client.h b/hbase-native-client/core/client.h index b8cb0a7..921cecc 100644 --- a/hbase-native-client/core/client.h +++ b/hbase-native-client/core/client.h @@ -17,10 +17,8 @@ * */ -#ifndef CORE_CLIENT_H_ -#define CORE_CLIENT_H_ +#pragma once #include class Client {}; -#endif // CORE_CLIENT_H_ diff --git a/hbase-native-client/core/connection.h b/hbase-native-client/core/connection.h index 664b9e5..5c9d6b8 100644 --- a/hbase-native-client/core/connection.h +++ b/hbase-native-client/core/connection.h @@ -15,8 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef CORE_CONNECTION_H_ -#define CORE_CONNECTION_H_ + +#pragma once class Connection { char *zk_quorum; @@ -24,4 +24,3 @@ class Connection { public: void set_zk_quorum(char *zk_q); }; -#endif // CORE_CONNECTION_H_ diff --git a/hbase-native-client/core/connection_attr.h b/hbase-native-client/core/connection_attr.h index 4cfa14a..a312005 100644 --- a/hbase-native-client/core/connection_attr.h +++ b/hbase-native-client/core/connection_attr.h @@ -17,11 +17,8 @@ * */ -#ifndef CORE_CONNECTION_ATTR_H_ -#define CORE_CONNECTION_ATTR_H_ +#pragma once #include "core/hbase_macros.h" class ConnectionAttr {}; - -#endif // CORE_CONNECTION_ATTR_H_ diff --git a/hbase-native-client/core/delete.h b/hbase-native-client/core/delete.h index fbc477d..34f6a6c 100644 --- a/hbase-native-client/core/delete.h +++ b/hbase-native-client/core/delete.h @@ -17,8 +17,7 @@ * */ -#ifndef CORE_DELETE_H_ -#define CORE_DELETE_H_ +#pragma once #include "core/mutation.h" @@ -26,4 +25,3 @@ class Delete : public Mutation { public: ~Delete(); }; -#endif // CORE_DELETE_H_ diff --git a/hbase-native-client/core/get.h b/hbase-native-client/core/get.h index a7fedfb..d7f3366 100644 --- a/hbase-native-client/core/get.h +++ b/hbase-native-client/core/get.h @@ -17,9 +17,7 @@ * */ -#ifndef CORE_GET_H_ -#define CORE_GET_H_ + +#pragma once class Get {}; - -#endif // CORE_GET_H_ diff --git a/hbase-native-client/core/hbase_macros.h b/hbase-native-client/core/hbase_macros.h index 230a78b..48304f0 100644 --- a/hbase-native-client/core/hbase_macros.h +++ b/hbase-native-client/core/hbase_macros.h @@ -17,8 +17,7 @@ * */ -#ifndef CORE_HBASE_MACROS_H_ -#define CORE_HBASE_MACROS_H_ +#pragma once #ifdef __cplusplus extern "C" { @@ -55,5 +54,3 @@ extern "C" { #ifdef __cplusplus } // extern "C" #endif // __cplusplus - -#endif // CORE_HBASE_MACROS_H_ diff --git a/hbase-native-client/core/mutation.h b/hbase-native-client/core/mutation.h index c64e8f0..1880571 100644 --- a/hbase-native-client/core/mutation.h +++ b/hbase-native-client/core/mutation.h @@ -17,8 +17,7 @@ * */ -#ifndef CORE_MUTATION_H_ -#define CORE_MUTATION_H_ +#pragma once #include @@ -57,4 +56,3 @@ public: virtual ~Mutation(); }; -#endif // CORE_MUTATION_H_ diff --git a/hbase-native-client/core/put.h b/hbase-native-client/core/put.h index 50366af..d34aa0d 100644 --- a/hbase-native-client/core/put.h +++ b/hbase-native-client/core/put.h @@ -17,8 +17,7 @@ * */ -#ifndef CORE_PUT_H_ -#define CORE_PUT_H_ +#pragma once #include "core/mutation.h" @@ -26,4 +25,3 @@ class Put : public Mutation { public: ~Put(); }; -#endif // CORE_PUT_H_ diff --git a/hbase-native-client/core/scanner.h b/hbase-native-client/core/scanner.h index 1850f98..180865a 100644 --- a/hbase-native-client/core/scanner.h +++ b/hbase-native-client/core/scanner.h @@ -17,8 +17,6 @@ * */ -#ifndef CORE_SCANNER_H_ -#define CORE_SCANNER_H_ +#pragma once class Scanner {}; -#endif // CORE_SCANNER_H_ diff --git a/hbase-native-client/sync/CMakeLists.txt b/hbase-native-client/sync/CMakeLists.txt deleted file mode 100644 index bfb7e6c..0000000 --- a/hbase-native-client/sync/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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. - -set( SYNC_SRC - hbase_connection.cc - hbase_admin.cc -) - - -add_library(hsync OBJECT ${SYNC_SRC}) diff --git a/hbase-native-client/sync/hbase_admin.cc b/hbase-native-client/sync/hbase_admin.cc deleted file mode 100644 index d43c8ec..0000000 --- a/hbase-native-client/sync/hbase_admin.cc +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#include "sync/hbase_admin.h" - -#include -#include - -#include "core/admin.h" - -int32_t hb_admin_create(hb_admin_t** admin_ptr) { - (*admin_ptr) = reinterpret_cast(new Admin()); - return 0; -} - -/* - * Disconnect the admin releasing any internal objects - * or connections created in the background. - */ -int32_t hb_admin_destroy(hb_admin_t * admin) { - Admin * adm = reinterpret_cast(admin); - delete adm; - return 0; -} - -/* - * See if a table exists. - */ -int32_t hb_admin_table_exists(hb_admin_t * admin, - char * name_space, size_t name_space_length, - char * table, size_t table_length, - bool * exists) { - *exists = true; - return 0; -} diff --git a/hbase-native-client/sync/hbase_admin.h b/hbase-native-client/sync/hbase_admin.h deleted file mode 100644 index 860bfba..0000000 --- a/hbase-native-client/sync/hbase_admin.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#ifndef SYNC_HBASE_ADMIN_H_ -#define SYNC_HBASE_ADMIN_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include - -#include "core/hbase_macros.h" -#include "core/hbase_types.h" -#include "sync/hbase_connection.h" - - -/** - * Create a new hb_admin. - * All fields are initialized to the defaults. If you want to set - * connection or other properties, set those before calling any - * RPC functions. - */ -HBASE_API int32_t hb_admin_create(hb_admin_t* admin_ptr, - hb_connection_t connection); - -/* - * Disconnect the admin releasing any internal objects - * or connections created in the background. - */ -HBASE_API int32_t hb_admin_destroy(hb_admin_t admin); - -/* - * See if a table exists. - */ -HBASE_API int32_t hb_admin_table_exists(hb_admin_t admin, - char * name_space, size_t name_space_length, - char * table, size_t table_length, bool * exists); - -#ifdef __cplusplus -} // extern "C" -#endif // __cplusplus - -#endif // SYNC_HBASE_ADMIN_H_ diff --git a/hbase-native-client/sync/hbase_connection.cc b/hbase-native-client/sync/hbase_connection.cc deleted file mode 100644 index df05376..0000000 --- a/hbase-native-client/sync/hbase_connection.cc +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#include "sync/hbase_connection.h" - -#include "core/connection.h" -#include "core/hbase_types.h" - -extern "C" { -int32_t hb_connection_create(hb_connection_t * connection_ptr, - hb_connection_attr_t connection_attr) { - (*connection_ptr) = reinterpret_cast(new Connection()); - if ((*connection_ptr) == NULL) - return -1; - return 0; -} -int32_t hb_connection_destroy(hb_connection_t connection) { - free(connection); - return 0; -} -} // extern "C" diff --git a/hbase-native-client/sync/hbase_connection.h b/hbase-native-client/sync/hbase_connection.h deleted file mode 100644 index af9284d..0000000 --- a/hbase-native-client/sync/hbase_connection.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#ifndef SYNC_HBASE_CONNECTION_H_ -#define SYNC_HBASE_CONNECTION_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "core/hbase_macros.h" -#include "core/hbase_types.h" -#include "core/hbase_connection_attr.h" - -#include - -/** - * Create an hb_connection. - * - * if connection_attr is null everything will be left as default - */ -HBASE_API int32_t hb_connection_create(hb_connection_t * connection_ptr, - hb_connection_attr_t connection_attr); - -/** - * Destroy the connection and free all resources allocated at creation - * time. - */ -HBASE_API int32_t hb_connection_destroy(hb_connection_t connection); - -#ifdef __cplusplus -} // extern "C" -#endif // __cplusplus - -#endif // SYNC_HBASE_CONNECTION_H_ - -- 2.6.1