Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Rename directory containing proto files #6379

Merged
merged 12 commits into from
Nov 20, 2024
Merged

fix: Rename directory containing proto files #6379

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
767c7d6
wip
niloc132 Nov 14, 2024
c3ca094
Fix js api
niloc132 Nov 14, 2024
58d899b
HAck python client to still work
niloc132 Nov 14, 2024
8777963
Fix c++ - revert this to hunt c++ build issue
niloc132 Nov 14, 2024
e49b31e
import cleanup
niloc132 Nov 14, 2024
7fc1c9c
Build proto jar with full package structure
niloc132 Nov 15, 2024
65cc2ef
Warn about moved namespace
niloc132 Nov 15, 2024
8e99e22
Rename internal usages of the old py namespace
niloc132 Nov 15, 2024
0d558d3
Add missing dependencies for py server integration tests
niloc132 Nov 15, 2024
2a2706d
Remove commented out details, fix packaging for wheel
niloc132 Nov 15, 2024
330910c
More review feedback
niloc132 Nov 15, 2024
4aead5e
Merge branch 'main' into 6376-proto-dir-changes
niloc132 Nov 20, 2024
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
1 change: 1 addition & 0 deletions Integrations/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ def runInDocker = { String name, String sourcePath, List<String> command, Closur
from("${sourcePath}/../client") {
include 'setup.py'
include 'pydeephaven/**'
include 'deephaven_core/**'
include 'README.md'
into 'python/client'
}
Expand Down
2 changes: 0 additions & 2 deletions cpp-client/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import io.deephaven.tools.docker.DiffTask

plugins {
id 'com.bmuschko.docker-remote-api'
id 'io.deephaven.project.register'
Expand Down
24 changes: 12 additions & 12 deletions cpp-client/deephaven/dhclient/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ set(PROTO_SRC_DIR
"${CMAKE_CURRENT_SOURCE_DIR}/../../../proto/proto-backplane-grpc/src/main/proto")
set(PROTO_GEN_DIR
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}/proto")
set(PROTO_OUT_DIR "${PROTO_GEN_DIR}/deephaven/proto")
set(PROTO_OUT_DIR "${PROTO_GEN_DIR}/deephaven_core/proto")

set(PROTO_FILES
"${PROTO_SRC_DIR}/deephaven/proto/application.proto"
"${PROTO_SRC_DIR}/deephaven/proto/config.proto"
"${PROTO_SRC_DIR}/deephaven/proto/console.proto"
"${PROTO_SRC_DIR}/deephaven/proto/hierarchicaltable.proto"
"${PROTO_SRC_DIR}/deephaven/proto/inputtable.proto"
"${PROTO_SRC_DIR}/deephaven/proto/object.proto"
"${PROTO_SRC_DIR}/deephaven/proto/partitionedtable.proto"
"${PROTO_SRC_DIR}/deephaven/proto/session.proto"
"${PROTO_SRC_DIR}/deephaven/proto/storage.proto"
"${PROTO_SRC_DIR}/deephaven/proto/table.proto"
"${PROTO_SRC_DIR}/deephaven/proto/ticket.proto"
"${PROTO_SRC_DIR}/deephaven_core/proto/application.proto"
"${PROTO_SRC_DIR}/deephaven_core/proto/config.proto"
"${PROTO_SRC_DIR}/deephaven_core/proto/console.proto"
"${PROTO_SRC_DIR}/deephaven_core/proto/hierarchicaltable.proto"
"${PROTO_SRC_DIR}/deephaven_core/proto/inputtable.proto"
"${PROTO_SRC_DIR}/deephaven_core/proto/object.proto"
"${PROTO_SRC_DIR}/deephaven_core/proto/partitionedtable.proto"
"${PROTO_SRC_DIR}/deephaven_core/proto/session.proto"
"${PROTO_SRC_DIR}/deephaven_core/proto/storage.proto"
"${PROTO_SRC_DIR}/deephaven_core/proto/table.proto"
"${PROTO_SRC_DIR}/deephaven_core/proto/ticket.proto"
)

foreach(PROTO_FILE ${PROTO_FILES})
Expand Down
8 changes: 4 additions & 4 deletions cpp-client/deephaven/dhclient/include/private/deephaven/client/impl/aggregate_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
#pragma once

#include <memory>
#include "deephaven/proto/session.pb.h"
#include "deephaven/proto/session.grpc.pb.h"
#include "deephaven/proto/table.pb.h"
#include "deephaven/proto/table.grpc.pb.h"
#include "deephaven_core/proto/session.pb.h"
#include "deephaven_core/proto/session.grpc.pb.h"
#include "deephaven_core/proto/table.pb.h"
#include "deephaven_core/proto/table.grpc.pb.h"

namespace deephaven::client::impl {
class AggregateImpl {
Expand Down
8 changes: 4 additions & 4 deletions cpp-client/deephaven/dhclient/include/private/deephaven/client/impl/table_handle_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#include "deephaven/dhcore/clienttable/schema.h"
#include "deephaven/dhcore/ticking/ticking.h"
#include "deephaven/dhcore/types.h"
#include "deephaven/proto/session.pb.h"
#include "deephaven/proto/session.grpc.pb.h"
#include "deephaven/proto/table.pb.h"
#include "deephaven/proto/table.grpc.pb.h"
#include "deephaven_core/proto/session.pb.h"
#include "deephaven_core/proto/session.grpc.pb.h"
#include "deephaven_core/proto/table.pb.h"
#include "deephaven_core/proto/table.grpc.pb.h"

namespace deephaven::client {
class SortPair;
Expand Down
4 changes: 2 additions & 2 deletions ...lient/deephaven/dhclient/include/private/deephaven/client/impl/update_by_operation_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
*/
#pragma once

#include "deephaven/proto/table.pb.h"
#include "deephaven/proto/table.grpc.pb.h"
#include "deephaven_core/proto/table.pb.h"
#include "deephaven_core/proto/table.grpc.pb.h"

namespace deephaven::client::impl {
class UpdateByOperationImpl {
Expand Down
28 changes: 14 additions & 14 deletions cpp-client/deephaven/dhclient/include/private/deephaven/client/server/server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@
#include "deephaven/client/utility/executor.h"
#include "deephaven/client/utility/misc_types.h"
#include "deephaven/dhcore/utility/utility.h"
#include "deephaven/proto/ticket.pb.h"
#include "deephaven/proto/ticket.grpc.pb.h"
#include "deephaven/proto/application.pb.h"
#include "deephaven/proto/application.grpc.pb.h"
#include "deephaven/proto/config.pb.h"
#include "deephaven/proto/config.grpc.pb.h"
#include "deephaven/proto/console.pb.h"
#include "deephaven/proto/console.grpc.pb.h"
#include "deephaven/proto/inputtable.pb.h"
#include "deephaven/proto/inputtable.grpc.pb.h"
#include "deephaven/proto/session.pb.h"
#include "deephaven/proto/session.grpc.pb.h"
#include "deephaven/proto/table.pb.h"
#include "deephaven/proto/table.grpc.pb.h"
#include "deephaven_core/proto/ticket.pb.h"
#include "deephaven_core/proto/ticket.grpc.pb.h"
#include "deephaven_core/proto/application.pb.h"
#include "deephaven_core/proto/application.grpc.pb.h"
#include "deephaven_core/proto/config.pb.h"
#include "deephaven_core/proto/config.grpc.pb.h"
#include "deephaven_core/proto/console.pb.h"
#include "deephaven_core/proto/console.grpc.pb.h"
#include "deephaven_core/proto/inputtable.pb.h"
#include "deephaven_core/proto/inputtable.grpc.pb.h"
#include "deephaven_core/proto/session.pb.h"
#include "deephaven_core/proto/session.grpc.pb.h"
#include "deephaven_core/proto/table.pb.h"
#include "deephaven_core/proto/table.grpc.pb.h"

namespace deephaven::client::server {
namespace internal {
Expand Down
2 changes: 1 addition & 1 deletion ...lient/deephaven/dhclient/include/private/deephaven/client/subscription/subscribe_thread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "deephaven/client/subscription/subscription_handle.h"
#include "deephaven/dhcore/clienttable/client_table.h"
#include "deephaven/dhcore/ticking/ticking.h"
#include "deephaven/proto/ticket.pb.h"
#include "deephaven_core/proto/ticket.pb.h"

namespace deephaven::client::subscription {
class SubscriptionThread {
Expand Down
4 changes: 2 additions & 2 deletions cpp-client/deephaven/dhclient/src/update_by.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
*/
#include "deephaven/client/client.h"

#include "deephaven/proto/table.pb.h"
#include "deephaven/proto/table.grpc.pb.h"
#include "deephaven_core/proto/table.pb.h"
#include "deephaven_core/proto/table.grpc.pb.h"
#include "deephaven/client/impl/update_by_operation_impl.h"
#include "deephaven/client/impl/util.h"
#include "deephaven/client/update_by.h"
Expand Down
Loading