Skip to content

Commit

Permalink
fix: Rename directory containing proto files (deephaven#6379)
Browse files Browse the repository at this point in the history
In order to make directory structures usable for downstream projects
seeking to add new services or messages that depend on our own proto
files, ensure that we name/package consistently for all languages.

This may be a breaking change for some downstream consumers, but these
changes should prevent needing to make future changes or add additional
build steps. Two places this may impact applications:
* The Python client proto package has been renamed from
`pydeephaven.proto` to `deephaven_core.proto`. The old import will
continue to work in this release, but will warn the first time it is
referenced.
* The deephaven-proto-backplane-grpc.jar still contains the .proto
files, but they are located in the deephaven_core/proto directory
instead of at the root of the jar.

Fixes deephaven#6376
  • Loading branch information
niloc132 authored Nov 20, 2024
1 parent acdb6bf commit 8df9655
Show file tree
Hide file tree
Showing 92 changed files with 7,213 additions and 7,216 deletions.
1 change: 1 addition & 0 deletions Integrations/build.gradle
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
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
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
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
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
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
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
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
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

0 comments on commit 8df9655

Please sign in to comment.