diff --git a/cpp-client/deephaven/client/include/private/deephaven/client/highlevel/impl/table_handle_impl.h b/cpp-client/deephaven/client/include/private/deephaven/client/highlevel/impl/table_handle_impl.h index 2323c3c926a..de981ab6976 100644 --- a/cpp-client/deephaven/client/include/private/deephaven/client/highlevel/impl/table_handle_impl.h +++ b/cpp-client/deephaven/client/include/private/deephaven/client/highlevel/impl/table_handle_impl.h @@ -162,9 +162,6 @@ class TableHandleImpl { std::shared_ptr exactJoin(const TableHandleImpl &rightSide, std::vector columnsToMatch, std::vector columnsToAdd) const; - std::shared_ptr leftJoin(const TableHandleImpl &rightSide, - std::vector columnsToMatch, std::vector columnsToAdd) const; - std::shared_ptr asOfJoin(AsOfJoinTablesRequest::MatchRule matchRule, const TableHandleImpl &rightSide, std::vector columnsToMatch, std::vector columnsToAdd); diff --git a/cpp-client/deephaven/client/include/private/deephaven/client/lowlevel/server.h b/cpp-client/deephaven/client/include/private/deephaven/client/lowlevel/server.h index bc15998506e..c629f6b4fc5 100644 --- a/cpp-client/deephaven/client/include/private/deephaven/client/lowlevel/server.h +++ b/cpp-client/deephaven/client/include/private/deephaven/client/lowlevel/server.h @@ -180,10 +180,6 @@ class Server { std::vector columnsToMatch, std::vector columnsToAdd, std::shared_ptr etcCallback); - Ticket leftJoinAsync(Ticket leftTableTicket, Ticket rightTableTicket, - std::vector columnsToMatch, std::vector columnsToAdd, - std::shared_ptr etcCallback); - Ticket asOfJoinAsync(AsOfJoinTablesRequest::MatchRule matchRule, Ticket leftTableTicket, Ticket rightTableTicket, std::vector columnsToMatch, std::vector columnsToAdd, std::shared_ptr etcCallback); diff --git a/cpp-client/deephaven/client/include/public/deephaven/client/highlevel/client.h b/cpp-client/deephaven/client/include/public/deephaven/client/highlevel/client.h index 4edd3221d0a..f05cf283f82 100644 --- a/cpp-client/deephaven/client/include/public/deephaven/client/highlevel/client.h +++ b/cpp-client/deephaven/client/include/public/deephaven/client/highlevel/client.h @@ -962,7 +962,7 @@ class TableHandle { * the columns in `columnsToMatch`, and columns from `rightSide` are brought in and optionally * renamed by `columnsToAdd`. Example: * @code - * t1.naturalJoin({"Col1", "Col2"}, {"Col3", "NewCol=Col4"}) + * t1.exactJoin({"Col1", "Col2"}, {"Col3", "NewCol=Col4"}) * @endcode * @param rightSide The table to join with this table * @param columnsToMatch The columns to join on @@ -985,34 +985,6 @@ class TableHandle { TableHandle exactJoin(const TableHandle &rightSide, std::vector columnsToMatch, std::vector columnsToAdd) const; - /** - * Creates a new table by left joining this table with `rightSide`. The tables are joined by - * the columns in `columnsToMatch`, and columns from `rightSide` are brought in and optionally - * renamed by `columnsToAdd`. Example: - * @code - * t1.naturalJoin({"Col1", "Col2"}, {"Col3", "NewCol=Col4"}) - * @endcode - * @param rightSide The table to join with this table - * @param columnsToMatch The columns to join on - * @param columnsToAdd The columns from the right side to add, and possibly rename. - * @return A TableHandle referencing the new table - */ - TableHandle leftJoin(const TableHandle &rightSide, std::vector columnsToMatch, - std::vector columnsToAdd) const; - /** - * The fluent version of leftJoin(const TableHandle &, std::vector, std::vector) const. - * @code - * t1.leftJoin(col1, col2}, {col3, col4.as("NewCol"}) - * @endcode - - * @param rightSide The table to join with this table - * @param columnsToMatch The columns to join on - * @param columnsToAdd The columns from the right side to add, and possibly rename. - * @return - */ - TableHandle leftJoin(const TableHandle &rightSide, std::vector columnsToMatch, - std::vector columnsToAdd) const; - /** * Binds this table to a variable name in the QueryScope. * @param variable diff --git a/cpp-client/deephaven/client/src/highlevel/client.cc b/cpp-client/deephaven/client/src/highlevel/client.cc index d5dbacc65eb..947d935e29c 100644 --- a/cpp-client/deephaven/client/src/highlevel/client.cc +++ b/cpp-client/deephaven/client/src/highlevel/client.cc @@ -495,20 +495,6 @@ TableHandle TableHandle::exactJoin(const TableHandle &rightSide, return exactJoin(rightSide, std::move(ctmStrings), std::move(ctaStrings)); } -TableHandle TableHandle::leftJoin(const TableHandle &rightSide, - std::vector columnsToMatch, std::vector columnsToAdd) const { - auto qtImpl = impl_->leftJoin(*rightSide.impl_, std::move(columnsToMatch), - std::move(columnsToAdd)); - return TableHandle(std::move(qtImpl)); -} - -TableHandle TableHandle::leftJoin(const TableHandle &rightSide, - std::vector columnsToMatch, std::vector columnsToAdd) const { - auto ctmStrings = toIrisRepresentation(columnsToMatch); - auto ctaStrings = toIrisRepresentation(columnsToAdd); - return leftJoin(rightSide, std::move(ctmStrings), std::move(ctaStrings)); -} - void TableHandle::bindToVariable(std::string variable) const { auto res = SFCallback<>::createForFuture(); bindToVariableAsync(std::move(variable), std::move(res.first)); diff --git a/cpp-client/deephaven/client/src/highlevel/impl/table_handle_impl.cc b/cpp-client/deephaven/client/src/highlevel/impl/table_handle_impl.cc index da68664592d..5948295e335 100644 --- a/cpp-client/deephaven/client/src/highlevel/impl/table_handle_impl.cc +++ b/cpp-client/deephaven/client/src/highlevel/impl/table_handle_impl.cc @@ -303,14 +303,6 @@ std::shared_ptr TableHandleImpl::exactJoin(const TableHandleImp return TableHandleImpl::create(managerImpl_, std::move(resultTicket), std::move(cb)); } -std::shared_ptr TableHandleImpl::leftJoin(const TableHandleImpl &rightSide, - std::vector columnsToMatch, std::vector columnsToAdd) const { - auto cb = TableHandleImpl::createEtcCallback(managerImpl_.get()); - auto resultTicket = managerImpl_->server()->leftJoinAsync(ticket_, rightSide.ticket_, - std::move(columnsToMatch), std::move(columnsToAdd), cb); - return TableHandleImpl::create(managerImpl_, std::move(resultTicket), std::move(cb)); -} - std::shared_ptr TableHandleImpl::asOfJoin(AsOfJoinTablesRequest::MatchRule matchRule, const TableHandleImpl &rightSide, std::vector columnsToMatch, std::vector columnsToAdd) { diff --git a/cpp-client/deephaven/client/src/lowlevel/server.cc b/cpp-client/deephaven/client/src/lowlevel/server.cc index 2c20d1f819e..3092d5dea66 100644 --- a/cpp-client/deephaven/client/src/lowlevel/server.cc +++ b/cpp-client/deephaven/client/src/lowlevel/server.cc @@ -27,7 +27,6 @@ using io::deephaven::proto::backplane::grpc::FetchTableRequest; using io::deephaven::proto::backplane::grpc::HandshakeRequest; using io::deephaven::proto::backplane::grpc::HeadOrTailRequest; using io::deephaven::proto::backplane::grpc::HeadOrTailByRequest; -using io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest; using io::deephaven::proto::backplane::grpc::MergeTablesRequest; using io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest; using io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest; @@ -361,20 +360,6 @@ Ticket Server::exactJoinAsync(Ticket leftTableTicket, Ticket rightTableTicket, return result; } -Ticket Server::leftJoinAsync(Ticket leftTableTicket, Ticket rightTableTicket, - std::vector columnsToMatch, std::vector columnsToAdd, - std::shared_ptr etcCallback) { - auto result = newTicket(); - LeftJoinTablesRequest req; - *req.mutable_result_id() = result; - *req.mutable_left_id()->mutable_ticket() = std::move(leftTableTicket); - *req.mutable_right_id()->mutable_ticket() = std::move(rightTableTicket); - moveVectorData(std::move(columnsToMatch), req.mutable_columns_to_match()); - moveVectorData(std::move(columnsToAdd), req.mutable_columns_to_add()); - sendRpc(req, std::move(etcCallback), tableStub(), &TableService::Stub::AsyncLeftJoinTables, true); - return result; -} - Ticket Server::asOfJoinAsync(AsOfJoinTablesRequest::MatchRule matchRule, Ticket leftTableTicket, Ticket rightTableTicket, std::vector columnsToMatch, std::vector columnsToAdd, std::shared_ptr etcCallback) {