Skip to content

Commit

Permalink
[yugabyte#16400, yugabyte#5042] DocDB:Remove ent folder
Browse files Browse the repository at this point in the history
Summary:
Goodbye and thanks for all the fish.

Fixes yugabyte#16400, yugabyte#5042

Test Plan:
All tests

python python/yb/gen_pch.py

export YB_RUN_AFFECTED_TESTS_ONLY=1
build-support/jenkins/test.sh

Reviewers: slingam, bogdan

Reviewed By: slingam, bogdan

Subscribers: ybase, slingam

Differential Revision: https://phabricator.dev.yugabyte.com/D23489
  • Loading branch information
hari90 committed Mar 13, 2023
1 parent 403790c commit 6f33bb7
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 40 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ hs_err_pid*.log

compile_commands.json

# This might be added by some editors' Java plugins
ent/java/yb-cqlent/bin/

test_results.json
test_failures.json
*_test_report.json
Expand Down
4 changes: 1 addition & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
set(EXECUTABLE_OUTPUT_PATH "${YB_BUILD_ROOT}/bin")
file(MAKE_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")

# Generated sources always have higher priority than even the "ent" directory include files.
# Generated sources always have higher priority.
include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
include_directories(src)

Expand Down Expand Up @@ -815,8 +815,6 @@ add_subdirectory(src/yb/docdb)
add_subdirectory(src/yb/yql)
add_subdirectory(src/yb/cdc)

include("${YB_SRC_ROOT}/ent/CMakeLists.txt")

# Note "yb-server", without the "t" -- this is not a typo. "yb-server" is the unified LTO executable
# that contains the functionality of both yb-master and yb-tserver, and yb-master/yb-tserver are
# symlinks to it. It decides to act as yb-master or yb-tserver based on its argv[0].
Expand Down
4 changes: 2 additions & 2 deletions build-support/jenkins/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -551,8 +551,8 @@ if [[ ${YB_SKIP_CREATING_RELEASE_PACKAGE:-} != "1" &&

# Upload the package.
if ! is_jenkins_phabricator_build; then
# shellcheck source=ent/build-support/upload_package.sh
. "${YB_SRC_ROOT}/ent/build-support/upload_package.sh"
# shellcheck source=build-support/upload_package.sh
. "${YB_SRC_ROOT}/build-support/upload_package.sh"
if ! "${package_uploaded}" && ! "${package_upload_skipped}"; then
FAILURES+=$'Package upload failed\n'
EXIT_STATUS=1
Expand Down
File renamed without changes.
11 changes: 0 additions & 11 deletions ent/CMakeLists.txt

This file was deleted.

4 changes: 0 additions & 4 deletions python/yb/dep_graph_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -816,10 +816,6 @@ def _add_proto_generation_deps(self) -> None:
proto_rel_path = node.path_rel_to_src_root()
if proto_rel_path:
proto_rel_path = proto_rel_path[:-6]
if proto_rel_path.startswith('ent/'):
# Remove the 'ent/' prefix because there is no separate 'ent/' prefix
# in the build directory.
proto_rel_path = proto_rel_path[4:]
if proto_rel_path in proto_node_by_rel_path:
raise RuntimeError(
"Multiple .proto nodes found that share the same "
Expand Down
5 changes: 1 addition & 4 deletions python/yb/gen_pch.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,7 @@ def lib_for_path(self, path: str, **kwargs) -> typing.Union[None, str]:
return path

while len(path) != 0:
if path.startswith('ent/'):
path = path[4:]
else:
path = os.path.dirname(path)
path = os.path.dirname(path)
if path in self.libs:
return path
return None
Expand Down
20 changes: 7 additions & 13 deletions python/yb/yb_dist_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ def set_global_conf_from_dict(global_conf_dict: Dict[str, str]) -> GlobalTestCon

ARCHIVED_PATHS_IN_BUILD_DIR = [
'bin',
'ent',
'lib',
'postgres',
'share',
Expand Down Expand Up @@ -350,18 +349,13 @@ def set_global_conf_from_dict(global_conf_dict: Dict[str, str]) -> GlobalTestCon

def find_rel_java_paths_to_archive(yb_src_root: str) -> List[str]:
paths = []
for ent in [False, True]:
path_components = []
if ent:
path_components.append('ent')
path_components.append('java')
java_dir_path = os.path.join(yb_src_root, *path_components)
paths.append(os.path.join(java_dir_path, 'pom.xml'))
for submodule_dir_path in glob.glob(os.path.join(java_dir_path, '*')):
for name in ['pom.xml', 'src']:
paths.append(os.path.join(submodule_dir_path, name))
for classes_dir_name in ['classes', 'test-classes']:
paths.append(os.path.join(submodule_dir_path, 'target', classes_dir_name))
java_dir_path = os.path.join(yb_src_root, 'java')
paths.append(os.path.join(java_dir_path, 'pom.xml'))
for submodule_dir_path in glob.glob(os.path.join(java_dir_path, '*')):
for name in ['pom.xml', 'src']:
paths.append(os.path.join(submodule_dir_path, name))
for classes_dir_name in ['classes', 'test-classes']:
paths.append(os.path.join(submodule_dir_path, 'target', classes_dir_name))
return [os.path.relpath(p, yb_src_root) for p in paths]


Expand Down

0 comments on commit 6f33bb7

Please sign in to comment.