Skip to content

Commit

Permalink
changed folder name
Browse files Browse the repository at this point in the history
  • Loading branch information
heri-macedo committed Feb 8, 2024
1 parent 79bd65e commit d491fc0
Show file tree
Hide file tree
Showing 37 changed files with 62 additions and 61 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ To check library main features you can check [Hive Metastore Client's Documentat
An example of how to use the library for running DDL commands in hive metastore:

```python
from hive_metastore_client.builders import DatabaseBuilder
from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client_databricks.builders import DatabaseBuilder
from hive_metastore_client_databricks import HiveMetastoreClient

database = DatabaseBuilder(name='new_db').build()
with HiveMetastoreClient(HIVE_HOST, HIVE_PORT) as hive_metastore_client:
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
man_pages = [
(
master_doc,
"hive_metastore_client",
"hive_metastore_client_databricks",
"Hive Metastore Client Documentation",
[author],
1,
Expand Down
5 changes: 3 additions & 2 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ and to communicate with you Hive metastore server.
It is necessary to use the client instance with the `with` statement, this
guarantees that the connection will be automatically opened and closed for you.
I.g.:

```python
from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client.builders import DatabaseBuilder
from hive_metastore_client_databricks import HiveMetastoreClient
from hive_metastore_client_databricks.builders import DatabaseBuilder

database = DatabaseBuilder(name='new_db').build()
with HiveMetastoreClient(HIVE_HOST, HIVE_PORT) as hive_metastore_client:
Expand Down
4 changes: 2 additions & 2 deletions examples/add_columns_to_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Check Builder constructor for more information.
"""

from hive_metastore_client.builders import ColumnBuilder
from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client_databricks.builders import ColumnBuilder
from hive_metastore_client_databricks import HiveMetastoreClient

HIVE_HOST = "<ADD_HIVE_HOST_HERE>"
HIVE_PORT = 9083
Expand Down
4 changes: 2 additions & 2 deletions examples/add_partitions_if_not_exists.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from hive_metastore_client.builders import PartitionBuilder
from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client_databricks.builders import PartitionBuilder
from hive_metastore_client_databricks import HiveMetastoreClient

HIVE_HOST = "<ADD_HIVE_HOST_HERE>"
HIVE_PORT = 9083
Expand Down
4 changes: 2 additions & 2 deletions examples/add_partitions_to_table.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from hive_metastore_client.builders import PartitionBuilder
from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client_databricks.builders import PartitionBuilder
from hive_metastore_client_databricks import HiveMetastoreClient

HIVE_HOST = "<ADD_HIVE_HOST_HERE>"
HIVE_PORT = 9083
Expand Down
2 changes: 1 addition & 1 deletion examples/bulk_drop_partitions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client_databricks import HiveMetastoreClient

HIVE_HOST = "<ADD_HIVE_HOST_HERE>"
HIVE_PORT = 9083
Expand Down
4 changes: 2 additions & 2 deletions examples/create_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Check Builder constructor for more information.
"""

from hive_metastore_client.builders import DatabaseBuilder
from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client_databricks.builders import DatabaseBuilder
from hive_metastore_client_databricks import HiveMetastoreClient

HIVE_HOST = "<ADD_HIVE_HOST_HERE>"
HIVE_PORT = 9083
Expand Down
4 changes: 2 additions & 2 deletions examples/create_external_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
table parameters before calling the method create_table.
"""

from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client.builders import (
from hive_metastore_client_databricks import HiveMetastoreClient
from hive_metastore_client_databricks.builders import (
ColumnBuilder,
SerDeInfoBuilder,
StorageDescriptorBuilder,
Expand Down
4 changes: 2 additions & 2 deletions examples/create_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
example create_external_table.py.
"""

from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client.builders import (
from hive_metastore_client_databricks import HiveMetastoreClient
from hive_metastore_client_databricks.builders import (
ColumnBuilder,
SerDeInfoBuilder,
StorageDescriptorBuilder,
Expand Down
2 changes: 1 addition & 1 deletion examples/drop_columns_from_table.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client_databricks import HiveMetastoreClient

HIVE_HOST = "<ADD_HIVE_HOST_HERE>"
HIVE_PORT = 9083
Expand Down
4 changes: 2 additions & 2 deletions examples/drop_partition.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from hive_metastore_client.builders import PartitionBuilder
from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client_databricks.builders import PartitionBuilder
from hive_metastore_client_databricks import HiveMetastoreClient

HIVE_HOST = "<ADD_HIVE_HOST_HERE>"
HIVE_PORT = 9083
Expand Down
2 changes: 1 addition & 1 deletion examples/get_partition_keys.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client_databricks import HiveMetastoreClient

HIVE_HOST = "<ADD_HIVE_HOST_HERE>"
HIVE_PORT = 9083
Expand Down
2 changes: 1 addition & 1 deletion examples/get_partition_keys_names.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client_databricks import HiveMetastoreClient

HIVE_HOST = "<ADD_HIVE_HOST_HERE>"
HIVE_PORT = 9083
Expand Down
2 changes: 1 addition & 1 deletion examples/get_partition_keys_objects.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client_databricks import HiveMetastoreClient

HIVE_HOST = "<ADD_HIVE_HOST_HERE>"
HIVE_PORT = 9083
Expand Down
2 changes: 1 addition & 1 deletion examples/get_partition_values_from_table.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client_databricks import HiveMetastoreClient

HIVE_HOST = "<ADD_HIVE_HOST_HERE>"
HIVE_PORT = 9083
Expand Down
2 changes: 0 additions & 2 deletions hive_metastore_client/__init__.py

This file was deleted.

10 changes: 0 additions & 10 deletions hive_metastore_client/builders/__init__.py

This file was deleted.

2 changes: 2 additions & 0 deletions hive_metastore_client_databricks/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
"""Hive Metastore Client."""
from hive_metastore_client_databricks.hive_metastore_client_databricks import HiveMetastoreClientDatabricks
10 changes: 10 additions & 0 deletions hive_metastore_client_databricks/builders/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
"""Builders for helping library users to create the Thrift objects."""
from hive_metastore_client_databricks.builders.abstract_builder import AbstractBuilder
from hive_metastore_client_databricks.builders.column_builder import ColumnBuilder
from hive_metastore_client_databricks.builders.database_builder import DatabaseBuilder
from hive_metastore_client_databricks.builders.partition_builder import PartitionBuilder
from hive_metastore_client_databricks.builders.serde_info_builder import SerDeInfoBuilder
from hive_metastore_client_databricks.builders.storage_descriptor_builder import (
StorageDescriptorBuilder,
)
from hive_metastore_client_databricks.builders.table_builder import TableBuilder
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""ColumnBuilder."""
from hive_metastore_client.builders.abstract_builder import AbstractBuilder
from hive_metastore_client_databricks.builders.abstract_builder import AbstractBuilder
from thrift_files.libraries.thrift_hive_metastore_client.ttypes import FieldSchema # type: ignore # noqa: E501


Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""DatabaseBuilder."""
from typing import Mapping

from hive_metastore_client.builders.abstract_builder import AbstractBuilder
from hive_metastore_client_databricks.builders.abstract_builder import AbstractBuilder
from thrift_files.libraries.thrift_hive_metastore_client.ttypes import Database, PrincipalPrivilegeSet, PrincipalType # type: ignore # noqa: E501


Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""SerDeInfoBuilder."""
from typing import Dict

from hive_metastore_client.builders.abstract_builder import AbstractBuilder
from hive_metastore_client_databricks.builders.abstract_builder import AbstractBuilder
from thrift_files.libraries.thrift_hive_metastore_client.ttypes import ( # type: ignore # noqa: E501
SerDeInfo,
SerdeType,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""StorageDescriptorBuilder."""
from typing import List, Dict

from hive_metastore_client.builders.abstract_builder import AbstractBuilder
from hive_metastore_client_databricks.builders.abstract_builder import AbstractBuilder
from thrift_files.libraries.thrift_hive_metastore_client.ttypes import ( # type: ignore # noqa: E501
StorageDescriptor,
FieldSchema,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""TableBuilder."""
from typing import List, Dict

from hive_metastore_client.builders.abstract_builder import AbstractBuilder
from hive_metastore_client_databricks.builders.abstract_builder import AbstractBuilder
from thrift_files.libraries.thrift_hive_metastore_client.ttypes import ( # type: ignore # noqa: E501
Table,
FieldSchema,
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from setuptools import find_packages, setup

__package_name__ = "hive_metastore_client"
__package_name__ = "hive_metastore_client_databricks"
__version__ = "1.0.9"
__repository_url__ = "https://github.com/quintoandar/hive-metastore-client"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from unittest import mock
from unittest.mock import Mock

from hive_metastore_client.builders.column_builder import ColumnBuilder
from hive_metastore_client_databricks.builders.column_builder import ColumnBuilder


class TestColumnBuilder:
@mock.patch("hive_metastore_client.builders.column_builder.FieldSchema")
@mock.patch("hive_metastore_client_databricks.builders.column_builder.FieldSchema")
def test_build(self, mocked_field_schema):
# arrange
mocked_name = "a"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from unittest import mock
from unittest.mock import Mock
from hive_metastore_client.builders.database_builder import DatabaseBuilder
from hive_metastore_client_databricks.builders.database_builder import DatabaseBuilder


class TestDatabaseBuilder:
@mock.patch("hive_metastore_client.builders.database_builder.Database")
@mock.patch("hive_metastore_client_databricks.builders.database_builder.Database")
def test_build(self, mocked_database):
# arrange
mocked_database_name = "database_name"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from unittest import mock
from unittest.mock import Mock

from hive_metastore_client.builders import PartitionBuilder
from hive_metastore_client_databricks.builders import PartitionBuilder


class TestPartitionBuilder:
@mock.patch("hive_metastore_client.builders.partition_builder.Partition")
@mock.patch("hive_metastore_client_databricks.builders.partition_builder.Partition")
def test_build(self, mocked_partition):
# arrange
values = ["1", "2"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from unittest import mock
from unittest.mock import Mock

from hive_metastore_client.builders.serde_info_builder import SerDeInfoBuilder
from hive_metastore_client_databricks.builders.serde_info_builder import SerDeInfoBuilder


class TestSerDeInfoBuilder:
@mock.patch("hive_metastore_client.builders.serde_info_builder.SerDeInfo")
@mock.patch("hive_metastore_client_databricks.builders.serde_info_builder.SerDeInfo")
def test_build(self, mocked_serde_info):
# arrange
mocked_name = "<name>"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
from unittest import mock
from unittest.mock import Mock

from hive_metastore_client.builders.storage_descriptor_builder import (
from hive_metastore_client_databricks.builders.storage_descriptor_builder import (
StorageDescriptorBuilder,
)


class TestStorageDescriptorBuilder:
@mock.patch(
"hive_metastore_client.builders.storage_descriptor_builder.StorageDescriptor"
"hive_metastore_client_databricks.builders.storage_descriptor_builder.StorageDescriptor"
)
def test_build(self, mocked_storage_descriptor):
# arrange
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from unittest import mock
from unittest.mock import Mock

from hive_metastore_client.builders.table_builder import TableBuilder
from hive_metastore_client_databricks.builders.table_builder import TableBuilder


class TestTableBuilder:
@mock.patch("hive_metastore_client.builders.table_builder.Table")
@mock.patch("hive_metastore_client_databricks.builders.table_builder.Table")
def test_build(self, mocked_table):
# arrange
mocked_table_name = ""
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/hive_metastore_client/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import pytest

from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client_databricks import HiveMetastoreClient


@pytest.fixture
Expand Down
10 changes: 5 additions & 5 deletions tests/unit/hive_metastore_client/test_hive_metastore_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
from pytest import raises
from thrift.transport.TTransport import TTransportException

from hive_metastore_client import HiveMetastoreClient
from hive_metastore_client.builders import TableBuilder
from hive_metastore_client_databricks import HiveMetastoreClient
from hive_metastore_client_databricks.builders import TableBuilder
from thrift_files.libraries.thrift_hive_metastore_client.ttypes import (
FieldSchema,
NoSuchObjectException,
Expand All @@ -17,9 +17,9 @@


class TestHiveMetastoreClient:
@mock.patch("hive_metastore_client.hive_metastore_client.TSocket")
@mock.patch("hive_metastore_client.hive_metastore_client.TTransport")
@mock.patch("hive_metastore_client.hive_metastore_client.TBinaryProtocol")
@mock.patch("hive_metastore_client_databricks.hive_metastore_client_databricks.TSocket")
@mock.patch("hive_metastore_client_databricks.hive_metastore_client_databricks.TTransport")
@mock.patch("hive_metastore_client_databricks.hive_metastore_client_databricks.TBinaryProtocol")
def test__init_protocol(
self, mocked_tbinaryp, mocked_ttransport, mocked_tsocket, hive_metastore_client
):
Expand Down

0 comments on commit d491fc0

Please sign in to comment.