Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/start-hbase.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ if "%distMode%"=="false" (
if "%distMode%"=="true" (
@echo This is not implemented yet. Stay tuned.
@rem call %HBASE_BIN_PATH%\hbase-daemons.cmd --config "${HBASE_CONF_DIR}" start zookeeper
@rem call %HBASE_BIN_PATH%\hbase-daemon.cmd --config "${HBASE_CONF_DIR}" start master
@rem call %HBASE_BIN_PATH%\hbase-daemon.cmd --config "${HBASE_CONF_DIR}" start master

@rem call %HBASE_BIN_PATH%\hbase-daemons.cmd --config "%HBASE_CONF_DIR%" --hosts "%HBASE_REGIONSERVERS%" start regionserver
@rem call %HBASE_BIN_PATH%\hbase-daemons.cmd --config "%HBASE_CONF_DIR%" --hosts "%HBASE_BACKUP_MASTERS%" start master-backup
Expand All @@ -58,4 +58,4 @@ if "%distMode%"=="false" (

@rem -------------- End of main script --------------
endlocal
goto :eof
goto :eof
2 changes: 1 addition & 1 deletion bin/stop-hbase.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ if "%distMode%"=="false" (

@rem -------------- End of main script --------------
endlocal
goto :eof
goto :eof
2 changes: 1 addition & 1 deletion conf/hbase-env.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
@rem The maximum amount of heap to use. Default is left to JVM default.
@rem set HBASE_HEAPSIZE=1000

@rem Uncomment below if you intend to use off heap cache. For example, to allocate 8G of
@rem Uncomment below if you intend to use off heap cache. For example, to allocate 8G of
@rem offheap, set the value to "8G".
@rem set HBASE_OFFHEAPSIZE=1000

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,5 +253,3 @@ which have hardened over years can be marked IS.Stable.
“getService()” method. So WALCoprocessor which cannot support service doesn’t have one. That may
look minor thing. But if our design can cleanly convey what is and isn’t supported, that’s beautiful
and powerful and helpful for downstream developers.


8 changes: 4 additions & 4 deletions hbase-endpoint/src/main/protobuf/Aggregate.proto
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ message AggregateResponse {
* The AggregateService methods all have a response that either is a Pair
* or a simple object. When it is a Pair both first_part and second_part
* have defined values (and the second_part is not present in the response
* when the response is not a pair). Refer to the AggregateImplementation
* class for an overview of the AggregateResponse object constructions.
*/
* when the response is not a pair). Refer to the AggregateImplementation
* class for an overview of the AggregateResponse object constructions.
*/
repeated bytes first_part = 1;
optional bytes second_part = 2;
}

/** Refer to the AggregateImplementation class for an overview of the
/** Refer to the AggregateImplementation class for an overview of the
* AggregateService method implementations and their functionality.
*/
service AggregateService {
Expand Down
6 changes: 3 additions & 3 deletions hbase-endpoint/src/main/protobuf/BulkDelete.proto
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ message BulkDeleteRequest {
required DeleteType deleteType = 2;
optional uint64 timestamp = 3;
required uint32 rowBatchSize = 4;

enum DeleteType {
ROW = 0;
FAMILY = 1;
Expand All @@ -41,11 +41,11 @@ message BulkDeleteRequest {
}

message BulkDeleteResponse {
required uint64 rowsDeleted = 1;
required uint64 rowsDeleted = 1;
optional uint64 versionsDeleted = 2;
}

service BulkDeleteService {
rpc delete(BulkDeleteRequest)
returns (BulkDeleteResponse);
}
}
1 change: 0 additions & 1 deletion hbase-endpoint/src/main/protobuf/Export.proto
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ message ExportResponse {
required uint64 rowCount = 1;
required uint64 cellCount = 2;
}

Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ message TimeoutProcessorRequest {
}

message TimeoutProcessorResponse {
}
}
8 changes: 4 additions & 4 deletions hbase-examples/src/main/cpp/DemoClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ printRow(const std::vector<TRowResult> &rowResult)
{
for (size_t i = 0; i < rowResult.size(); i++) {
std::cout << "row: " << rowResult[i].row << ", cols: ";
for (CellMap::const_iterator it = rowResult[i].columns.begin();
for (CellMap::const_iterator it = rowResult[i].columns.begin();
it != rowResult[i].columns.end(); ++it) {
std::cout << it->first << " => " << it->second.value << "; ";
}
Expand All @@ -70,8 +70,8 @@ printVersions(const std::string &row, const CellVec &versions)

}

int
main(int argc, char** argv)
int
main(int argc, char** argv)
{
if (argc < 3) {
std::cerr << "Invalid arguments!\n" << "Usage: DemoClient host port" << std::endl;
Expand Down Expand Up @@ -222,7 +222,7 @@ main(int argc, char** argv)
client.getRow(rowResult, t, row, dummyAttributes);
printRow(rowResult);

// sleep to force later timestamp
// sleep to force later timestamp
poll(0, 0, 50);

mutations.clear();
Expand Down
1 change: 0 additions & 1 deletion hbase-examples/src/main/cpp/gen-cpp/Hbase.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion hbase-examples/src/main/cpp/gen-cpp/Hbase_constants.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,3 @@ int main(int argc, char **argv) {
server.serve();
return 0;
}

11 changes: 5 additions & 6 deletions hbase-examples/src/main/perl/DemoClient.pl
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
# 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.
Expand Down Expand Up @@ -199,14 +199,14 @@ ($)
$mutations = [
Hbase::Mutation->new ( { column => "entry:num", value => "0" } ),
Hbase::Mutation->new ( { column => "entry:foo", value => "FOO" } ),
];
];
$client->mutateRow ( $demo_table, $row, $mutations, %dummy_attributes );
printRow ( $client->getRow ( $demo_table, $row, %dummy_attributes ) );

$mutations = [
Hbase::Mutation->new ( { column => "entry:foo", isDelete => 1 } ),
Hbase::Mutation->new ( { column => "entry:num", value => -1 } ),
];
];
$client->mutateRow ( $demo_table, $row, $mutations, %dummy_attributes );
printRow ( $client->getRow ( $demo_table, $row, %dummy_attributes ) );

Expand All @@ -217,7 +217,7 @@ ($)
$client->mutateRow ( $demo_table, $row, $mutations, %dummy_attributes );
printRow ( $client->getRow ( $demo_table, $row, %dummy_attributes ) );

$mutations = [
$mutations = [
Hbase::Mutation->new ( { column => "entry:num", value => -999 } ),
Hbase::Mutation->new ( { column => "entry:sqr", isDelete => 1 } ),
];
Expand Down Expand Up @@ -285,4 +285,3 @@ ($)
$transport->close ();

exit 0;

Loading