Skip to content

Commit 9a649b6

Browse files
kosakkosak
authored
Rename Table to ClientTable and move to different namespace, in order to reduce terminology confusion. (#4028)
* Rename Table to ClientTable and move to different namespace, in order to reduce terminology confusion. * do not want
1 parent 85e7708 commit 9a649b6

File tree

18 files changed

+86
-86
lines changed

18 files changed

+86
-86
lines changed

‎cpp-client/deephaven/client/include/private/deephaven/client/impl/table_handle_impl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "deephaven/client/server/server.h"
1111
#include "deephaven/client/subscription/subscription_handle.h"
1212
#include "deephaven/client/utility/executor.h"
13-
#include "deephaven/dhcore/table/schema.h"
13+
#include "deephaven/dhcore/clienttable/schema.h"
1414
#include "deephaven/dhcore/ticking/ticking.h"
1515
#include "deephaven/dhcore/types.h"
1616
#include "deephaven/dhcore/utility/callbacks.h"
@@ -87,7 +87,7 @@ class ExportedTableCreationCallback final
8787
};
8888

8989
class LazyState final {
90-
typedef deephaven::dhcore::table::Schema Schema;
90+
typedef deephaven::dhcore::clienttable::Schema Schema;
9191
typedef io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse ExportedTableCreationResponse;
9292
typedef io::deephaven::proto::backplane::grpc::Ticket Ticket;
9393
typedef deephaven::client::server::Server Server;

‎cpp-client/deephaven/client/include/private/deephaven/client/subscription/subscribe_thread.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
#include <memory>
77
#include "deephaven/client/server/server.h"
88
#include "deephaven/client/subscription/subscription_handle.h"
9+
#include "deephaven/dhcore/clienttable/client_table.h"
910
#include "deephaven/dhcore/ticking/ticking.h"
1011
#include "deephaven/proto/ticket.pb.h"
1112

1213
namespace deephaven::client::subscription {
1314
class SubscriptionThread {
1415
typedef deephaven::client::server::Server Server;
1516
typedef deephaven::client::utility::Executor Executor;
16-
typedef deephaven::dhcore::table::Schema Schema;
17+
typedef deephaven::dhcore::clienttable::Schema Schema;
1718
typedef io::deephaven::proto::backplane::grpc::Ticket Ticket;
1819
typedef deephaven::dhcore::ticking::TickingCallback TickingCallback;
1920

‎cpp-client/deephaven/client/src/impl/table_handle_impl.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include "deephaven/client/subscription/subscription_handle.h"
2323
#include "deephaven/client/utility/arrow_util.h"
2424
#include "deephaven/dhcore/chunk/chunk_maker.h"
25+
#include "deephaven/dhcore/clienttable/client_table.h"
2526
#include "deephaven/dhcore/container/row_sequence.h"
26-
#include "deephaven/dhcore/table/table.h"
2727
#include "deephaven/dhcore/ticking/ticking.h"
2828
#include "deephaven/dhcore/utility/callbacks.h"
2929
#include "deephaven/dhcore/utility/utility.h"
@@ -54,8 +54,8 @@ using deephaven::dhcore::container::RowSequence;
5454
using deephaven::dhcore::container::RowSequenceBuilder;
5555
using deephaven::dhcore::container::RowSequenceIterator;
5656
using deephaven::dhcore::ElementTypeId;
57-
using deephaven::dhcore::table::Schema;
58-
using deephaven::dhcore::table::Table;
57+
using deephaven::dhcore::clienttable::Schema;
58+
using deephaven::dhcore::clienttable::ClientTable;
5959
using deephaven::dhcore::ticking::TickingCallback;
6060
using deephaven::dhcore::ticking::TickingUpdate;
6161
using deephaven::dhcore::utility::Callback;

‎cpp-client/deephaven/client/src/subscription/subscribe_thread.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
using deephaven::dhcore::column::ColumnSource;
1818
using deephaven::dhcore::chunk::AnyChunk;
19-
using deephaven::dhcore::table::Schema;
19+
using deephaven::dhcore::clienttable::Schema;
2020
using deephaven::dhcore::ticking::BarrageProcessor;
2121
using deephaven::dhcore::ticking::TickingCallback;
2222
using deephaven::dhcore::utility::Callback;

‎cpp-client/deephaven/dhcore/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ set(ALL_FILES
1212
src/types.cc
1313
src/chunk/chunk.cc
1414
src/chunk/chunk_maker.cc
15+
src/clienttable/schema.cc
16+
src/clienttable/client_table.cc
1517
src/column/array_column_source.cc
1618
src/column/column_source.cc
1719
src/column/column_source_helpers.cc
1820
src/column/column_source_utils.cc
1921
src/container/row_sequence.cc
2022
src/immerutil/abstract_flex_vector.cc
2123
src/immerutil/immer_column_source.cc
22-
src/table/schema.cc
23-
src/table/table.cc
2424
src/ticking/barrage_processor.cc
2525
src/ticking/immer_table_state.cc
2626
src/ticking/index_decoder.cc
@@ -40,14 +40,14 @@ set(ALL_FILES
4040
include/public/deephaven/dhcore/chunk/chunk.h
4141
include/public/deephaven/dhcore/chunk/chunk_maker.h
4242
include/public/deephaven/dhcore/chunk/chunk_traits.h
43+
include/public/deephaven/dhcore/clienttable/schema.h
44+
include/public/deephaven/dhcore/clienttable/client_table.h
4345
include/public/deephaven/dhcore/column/array_column_source.h
4446
include/public/deephaven/dhcore/column/buffer_column_source.h
4547
include/public/deephaven/dhcore/column/column_source.h
4648
include/public/deephaven/dhcore/column/column_source_helpers.h
4749
include/public/deephaven/dhcore/column/column_source_utils.h
4850
include/public/deephaven/dhcore/container/row_sequence.h
49-
include/public/deephaven/dhcore/table/schema.h
50-
include/public/deephaven/dhcore/table/table.h
5151
include/public/deephaven/dhcore/ticking/barrage_processor.h
5252
include/public/deephaven/dhcore/ticking/ticking.h
5353
include/public/deephaven/dhcore/utility/callbacks.h

‎cpp-client/deephaven/dhcore/include/private/deephaven/dhcore/ticking/immer_table_state.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "deephaven/dhcore/column/column_source.h"
88
#include "deephaven/dhcore/container/row_sequence.h"
99
#include "deephaven/dhcore/immerutil/abstract_flex_vector.h"
10-
#include "deephaven/dhcore/table/table.h"
10+
#include "deephaven/dhcore/clienttable/client_table.h"
1111
#include "deephaven/dhcore/ticking/space_mapper.h"
1212

1313
namespace deephaven::dhcore::ticking {
@@ -17,8 +17,8 @@ class ImmerTableState final {
1717
typedef deephaven::dhcore::column::ColumnSource ColumnSource;
1818
typedef deephaven::dhcore::container::RowSequence RowSequence;
1919
typedef deephaven::dhcore::immerutil::AbstractFlexVectorBase AbstractFlexVectorBase;
20-
typedef deephaven::dhcore::table::Schema Schema;
21-
typedef deephaven::dhcore::table::Table Table;
20+
typedef deephaven::dhcore::clienttable::ClientTable ClientTable;
21+
typedef deephaven::dhcore::clienttable::Schema Schema;
2222

2323
public:
2424
explicit ImmerTableState(std::shared_ptr<Schema> schema);
@@ -55,7 +55,7 @@ class ImmerTableState final {
5555
void applyShifts(const RowSequence &startIndex, const RowSequence &endIndex,
5656
const RowSequence &destIndex);
5757

58-
std::shared_ptr<Table> snapshot() const;
58+
std::shared_ptr<ClientTable> snapshot() const;
5959

6060
private:
6161
std::shared_ptr<Schema> schema_;

‎cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/table/table.h ‎cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/clienttable/client_table.h

+17-17
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@
1010
#include "deephaven/dhcore/column/column_source.h"
1111
#include "deephaven/dhcore/container/row_sequence.h"
1212

13-
namespace deephaven::dhcore::table {
13+
namespace deephaven::dhcore::clienttable {
1414
/**
1515
* Declaration provided in deephaven/dhcore/schema/schema.h
1616
*/
1717
class Schema;
1818
/**
1919
* Forward declaration (provided below).
2020
*/
21-
class Table;
21+
class ClientTable;
2222

2323
namespace internal {
2424
class TableStreamAdaptor {
2525
typedef deephaven::dhcore::container::RowSequence RowSequence;
2626
public:
27-
TableStreamAdaptor(const Table &table,
27+
TableStreamAdaptor(const ClientTable &table,
2828
std::vector<std::shared_ptr<RowSequence>> rowSequences, bool wantHeaders, bool wantRowNumbers,
2929
bool highlightCells) : table_(table), rowSequences_(std::move(rowSequences)),
3030
wantHeaders_(wantHeaders), wantRowNumbers_(wantRowNumbers), highlightCells_(highlightCells) {}
@@ -33,7 +33,7 @@ class TableStreamAdaptor {
3333
~TableStreamAdaptor() = default;
3434

3535
private:
36-
const Table &table_;
36+
const ClientTable &table_;
3737
std::vector<std::shared_ptr<RowSequence>> rowSequences_;
3838
bool wantHeaders_ = false;
3939
bool wantRowNumbers_ = false;
@@ -47,7 +47,7 @@ class TableStreamAdaptor {
4747
* An abstract base class representing a Deephaven table. This is used for example in
4848
* TickingUpdate to provide table snapshots to a caller who has subscribed to ticking tables.
4949
*/
50-
class Table {
50+
class ClientTable {
5151
public:
5252
/**
5353
* Alias.
@@ -61,24 +61,24 @@ class Table {
6161
/**
6262
* Constructor.
6363
*/
64-
Table() = default;
64+
ClientTable() = default;
6565
/**
6666
* Destructor.
6767
*/
68-
virtual ~Table() = default;
68+
virtual ~ClientTable() = default;
6969

7070
/**
7171
* Get the RowSequence (in position space) that underlies this Table.
7272
*/
7373
virtual std::shared_ptr<RowSequence> getRowSequence() const = 0;
7474
/**
75-
* Gets a ColumnSource from the table by index.
75+
* Gets a ColumnSource from the clienttable by index.
7676
* @param columnIndex Must be in the half-open interval [0, numColumns).
7777
*/
7878
virtual std::shared_ptr<ColumnSource> getColumn(size_t columnIndex) const = 0;
7979

8080
/**
81-
* Gets a ColumnSource from the table by name. 'strict' controls whether the method
81+
* Gets a ColumnSource from the clienttable by name. 'strict' controls whether the method
8282
* must succeed.
8383
* @param name The name of the column.
8484
* @param strict Whether the method must succeed.
@@ -87,7 +87,7 @@ class Table {
8787
*/
8888
std::shared_ptr<ColumnSource> getColumn(std::string_view name, bool strict) const;
8989
/**
90-
* Gets the index of a ColumnSource from the table by name. 'strict' controls whether the method
90+
* Gets the index of a ColumnSource from the clienttable by name. 'strict' controls whether the method
9191
* must succeed.
9292
* @param name The name of the column.
9393
* @param strict Whether the method must succeed.
@@ -98,33 +98,33 @@ class Table {
9898
std::optional<size_t> getColumnIndex(std::string_view name, bool strict) const;
9999

100100
/**
101-
* Number of rows in the table.
101+
* Number of rows in the clienttable.
102102
*/
103103
virtual size_t numRows() const = 0;
104104
/**
105-
* Number of columns in the table.
105+
* Number of columns in the clienttable.
106106
*/
107107
virtual size_t numColumns() const = 0;
108108
/**
109-
* The table schema.
109+
* The clienttable schema.
110110
*/
111111
virtual std::shared_ptr<Schema> schema() const = 0;
112112

113113
/**
114-
* Creates an 'ostream adaptor' to use when printing the table. Example usage:
114+
* Creates an 'ostream adaptor' to use when printing the clienttable. Example usage:
115115
* std::cout << myTable.stream(true, false).
116116
*/
117117
internal::TableStreamAdaptor stream(bool wantHeaders, bool wantRowNumbers) const;
118118

119119
/**
120-
* Creates an 'ostream adaptor' to use when printing the table. Example usage:
120+
* Creates an 'ostream adaptor' to use when printing the clienttable. Example usage:
121121
* std::cout << myTable.stream(true, false, rowSeq).
122122
*/
123123
internal::TableStreamAdaptor stream(bool wantHeaders, bool wantRowNumbers,
124124
std::shared_ptr<RowSequence> rowSequence) const;
125125

126126
/**
127-
* Creates an 'ostream adaptor' to use when printing the table. Example usage:
127+
* Creates an 'ostream adaptor' to use when printing the clienttable. Example usage:
128128
* std::cout << myTable.stream(true, false, rowSequences).
129129
*/
130130
internal::TableStreamAdaptor stream(bool wantHeaders, bool wantRowNumbers,
@@ -147,4 +147,4 @@ class Table {
147147
std::string toString(bool wantHeaders, bool wantRowNumbers,
148148
std::vector<std::shared_ptr<RowSequence>> rowSequences) const;
149149
};
150-
} // namespace deephaven::dhcore::table
150+
} // namespace deephaven::dhcore::clienttable

‎cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/table/schema.h ‎cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/clienttable/schema.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
#include "deephaven/dhcore/column/column_source.h"
1212
#include "deephaven/dhcore/container/row_sequence.h"
1313

14-
namespace deephaven::dhcore::table {
14+
namespace deephaven::dhcore::clienttable {
1515
/**
16-
* The table schema that goes along with a Table class. This Schema object tells you about
17-
* the names and data types of the table columns.
16+
* The clienttable schema that goes along with a Table class. This Schema object tells you about
17+
* the names and data types of the clienttable columns.
1818
*/
1919
class Schema {
2020
struct Private {};
@@ -54,4 +54,4 @@ class Schema {
5454
std::vector<ElementTypeId::Enum> types_;
5555
std::map<std::string_view, size_t, std::less<>> index_;
5656
};
57-
} // namespace deephaven::dhcore::table
57+
} // namespace deephaven::dhcore::clienttable

‎cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/ticking/barrage_processor.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <optional>
99
#include <vector>
1010
#include "deephaven/dhcore/chunk/chunk.h"
11-
#include "deephaven/dhcore/table/schema.h"
11+
#include "deephaven/dhcore/clienttable/schema.h"
1212
#include "deephaven/dhcore/ticking/ticking.h"
1313

1414
namespace deephaven::dhcore::ticking {
@@ -18,7 +18,7 @@ class BarrageProcessorImpl;
1818

1919
class BarrageProcessor final {
2020
protected:
21-
typedef deephaven::dhcore::table::Schema Schema;
21+
typedef deephaven::dhcore::clienttable::Schema Schema;
2222
typedef deephaven::dhcore::column::ColumnSource ColumnSource;
2323

2424
public:

‎cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/ticking/ticking.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <set>
1111
#include "deephaven/dhcore/utility/callbacks.h"
1212
#include "deephaven/dhcore/container/row_sequence.h"
13-
#include "deephaven/dhcore/table/table.h"
13+
#include "deephaven/dhcore/clienttable/client_table.h"
1414

1515
namespace deephaven::dhcore::ticking {
1616
class TickingUpdate;
@@ -71,7 +71,7 @@ class TickingUpdate final {
7171
/**
7272
* Alias.
7373
*/
74-
typedef deephaven::dhcore::table::Table Table;
74+
typedef deephaven::dhcore::clienttable::ClientTable Table;
7575

7676
/**
7777
* Default constructor.

‎cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/utility/cython_support.h

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#include <string>
77
#include <vector>
8-
#include "deephaven/dhcore/table/table.h"
98
#include "deephaven/dhcore/types.h"
109
#include "deephaven/dhcore/column/buffer_column_source.h"
1110

0 commit comments

Comments
 (0)