Skip to content

Commit

Permalink
Fixed renaming
Browse files Browse the repository at this point in the history 
renamed dir  exasol.analytics.query_handler.result
to  	     exasol.analytics.query_handler.query.result
renamed file exasol.analytics.query_handler.query.result.impl.py
to 	     exasol.analytics.query_handler.result.py
  • Loading branch information
@ckunki
ckunki committed Nov 13, 2024
1 parent 88c65a1 commit d95d2f8
Show file tree
Hide file tree
Showing 18 changed files with 42 additions and 42 deletions.
4 changes: 2 additions & 2 deletions doc/user_guide/example-udf-script/create.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ from typing import Union
from exasol.analytics.query_handler.udf.interface import UDFQueryHandler
from exasol.analytics.utils.dynamic_modules import create_module
from exasol.analytics.query_handler.context.query_handler_context import QueryHandlerContext
from exasol.analytics.query_handler.result.interface import QueryResult
from exasol.analytics.query_handler.result.impl import Result, Continue, Finish
from exasol.analytics.query_handler.query.result.interface import QueryResult
from exasol.analytics.query_handler.result import Result, Continue, Finish
from exasol.analytics.query_handler.query.select import SelectQuery, SelectQueryWithColumnDefinition
from exasol.analytics.query_handler.context.proxy.bucketfs_location_proxy import BucketFSLocationProxy
from exasol.analytics.schema import (
Expand Down
4 changes: 2 additions & 2 deletions exasol/analytics/query_handler/python_query_handler_runner.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from exasol.analytics.query_handler.query.interface import Query
from exasol.analytics.query_handler.query.select import SelectQueryWithColumnDefinition
from exasol.analytics.query_handler.query_handler import QueryHandler
from exasol.analytics.query_handler.result.impl import Continue, Finish
from exasol.analytics.query_handler.result.python_query_result import PythonQueryResult
from exasol.analytics.query_handler.result import Continue, Finish
from exasol.analytics.query_handler.query.result.python_query_result import PythonQueryResult
from exasol.analytics.query_handler.udf.runner.state import QueryHandlerRunnerState

LOGGER = logging.getLogger(__file__)
Expand Down
0 ...nalytics/query_handler/result/__init__.py → ...cs/query_handler/query/result/__init__.py
View file
File renamed without changes.
0 ...alytics/query_handler/result/interface.py → ...s/query_handler/query/result/interface.py
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ery_handler/result/python_query_result.py → ...ndler/query/result/python_query_result.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import pandas as pd
from exasol_udf_mock_python.column import Column

from exasol.analytics.query_handler.result.interface import QueryResult, Row
from exasol.analytics.query_handler.query.result.interface import QueryResult, Row


class PythonQueryResult(QueryResult):
Expand Down
2 changes: 1 addition & 1 deletion .../query_handler/result/udf_query_result.py → ..._handler/query/result/udf_query_result.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from exasol.analytics.schema.column_type import \
ColumnType

from exasol.analytics.query_handler.result.interface import QueryResult, Row
from exasol.analytics.query_handler.query.result.interface import QueryResult, Row


class UDFQueryResult(QueryResult):
Expand Down
4 changes: 2 additions & 2 deletions exasol/analytics/query_handler/query_handler.py
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from abc import ABC, abstractmethod
from typing import Any, Dict, TypeVar, Generic, Union

from exasol.analytics.query_handler.result.interface import QueryResult
from exasol.analytics.query_handler.query.result.interface import QueryResult
from exasol.analytics.query_handler.context.scope import ScopeQueryHandlerContext
from exasol.analytics.query_handler.result.impl import Result, Continue, Finish
from exasol.analytics.query_handler.result import Result, Continue, Finish

ResultType = TypeVar("ResultType")
ParameterType = TypeVar("ParameterType")
Expand Down
0 ...ol/analytics/query_handler/result/impl.py → exasol/analytics/query_handler/result.py
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions exasol/analytics/query_handler/udf/json_impl.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
from typing import Type, Union

from exasol.analytics.query_handler.context.scope import ScopeQueryHandlerContext
from exasol.analytics.query_handler.result.impl import Continue, Finish
from exasol.analytics.query_handler.result.interface import QueryResult
from exasol.analytics.query_handler.result import Continue, Finish
from exasol.analytics.query_handler.query.result.interface import QueryResult
from exasol.analytics.query_handler.json_udf_query_handler import JSONQueryHandler, JSONType
from exasol.analytics.query_handler.udf.interface import UDFQueryHandler
from exasol.analytics.query_handler.udf.interface import UDFQueryHandlerFactory
Expand Down
4 changes: 2 additions & 2 deletions exasol/analytics/query_handler/udf/runner/udf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
from exasol.analytics.query_handler.context.scope import ScopeQueryHandlerContext
from exasol.analytics.query_handler.context.top_level_query_handler_context import TopLevelQueryHandlerContext
from exasol.analytics.query_handler.query.select import SelectQueryWithColumnDefinition
from exasol.analytics.query_handler.result.impl import Finish, Continue, Result
from exasol.analytics.query_handler.result.udf_query_result import UDFQueryResult
from exasol.analytics.query_handler.result import Finish, Continue, Result
from exasol.analytics.query_handler.query.result.udf_query_result import UDFQueryResult
from exasol.analytics.query_handler.udf.runner.state import QueryHandlerRunnerState
from exasol.analytics.query_handler.udf.connection_lookup import UDFConnectionLookup

Expand Down
4 changes: 2 additions & 2 deletions tests/test_package/test_query_handlers/query_handler_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from exasol.analytics.query_handler.context.scope import ScopeQueryHandlerContext
from exasol.analytics.query_handler.query.select import SelectQuery, SelectQueryWithColumnDefinition
from exasol.analytics.query_handler.query_handler import ResultType
from exasol.analytics.query_handler.result.impl import Finish, Continue
from exasol.analytics.query_handler.result.interface import QueryResult
from exasol.analytics.query_handler.result import Finish, Continue
from exasol.analytics.query_handler.query.result.interface import QueryResult
from exasol.analytics.query_handler.udf.interface import UDFQueryHandler
from exasol.analytics.query_handler.udf.interface import UDFQueryHandlerFactory

Expand Down
6 changes: 3 additions & 3 deletions tests/unit_tests/query_handler/test_query_handler_interface.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
from exasol.analytics.query_handler.context.scope import ScopeQueryHandlerContext
from exasol.analytics.query_handler.query.select import SelectQueryWithColumnDefinition
from exasol.analytics.query_handler.query_handler import QueryHandler
from exasol.analytics.query_handler.result.impl import Continue, Finish
from exasol.analytics.query_handler.result.python_query_result import PythonQueryResult
from exasol.analytics.query_handler.result.interface import QueryResult
from exasol.analytics.query_handler.result import Continue, Finish
from exasol.analytics.query_handler.query.result.python_query_result import PythonQueryResult
from exasol.analytics.query_handler.query.result.interface import QueryResult


class TestQueryHandler(QueryHandler[Dict[str, Any], int]):
Expand Down
4 changes: 2 additions & 2 deletions tests/unit_tests/query_handler_runner/test_python_query_handler_runner.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
from exasol.analytics.query_handler.context.top_level_query_handler_context import TopLevelQueryHandlerContext
from exasol.analytics.query_handler.query.select import SelectQueryWithColumnDefinition, SelectQuery
from exasol.analytics.query_handler.query_handler import QueryHandler
from exasol.analytics.query_handler.result.impl import Continue, Finish
from exasol.analytics.query_handler.result.interface import QueryResult
from exasol.analytics.query_handler.result import Continue, Finish
from exasol.analytics.query_handler.query.result.interface import QueryResult
from exasol.analytics.query_handler.python_query_handler_runner import PythonQueryHandlerRunner

EXPECTED_EXCEPTION = "ExpectedException"
Expand Down
2 changes: 1 addition & 1 deletion tests/unit_tests/query_result/test_python_query_result.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
ColumnName,
)

from exasol.analytics.query_handler.result.python_query_result import PythonQueryResult
from exasol.analytics.query_handler.query.result.python_query_result import PythonQueryResult

DATA_SIZE = 100
FETCH_SIZE = 10
Expand Down
28 changes: 14 additions & 14 deletions tests/unit_tests/query_result/test_udf_query_result.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
def test_fetch_as_dataframe_column_names():
def udf_wrapper():
from exasol_udf_mock_python.udf_context import UDFContext
from exasol.analytics.query_handler.result.udf_query_result \
from exasol.analytics.query_handler.query.result.udf_query_result \
import UDFQueryResult
from collections import OrderedDict

Expand Down Expand Up @@ -45,7 +45,7 @@ def run(ctx: UDFContext):
def test_fetch_as_dataframe_first_batch():
def udf_wrapper():
from exasol_udf_mock_python.udf_context import UDFContext
from exasol.analytics.query_handler.result.udf_query_result \
from exasol.analytics.query_handler.query.result.udf_query_result \
import UDFQueryResult
from collections import OrderedDict

Expand Down Expand Up @@ -76,7 +76,7 @@ def run(ctx: UDFContext):
def test_fetch_as_dataframe_second_batch():
def udf_wrapper():
from exasol_udf_mock_python.udf_context import UDFContext
from exasol.analytics.query_handler.result.udf_query_result \
from exasol.analytics.query_handler.query.result.udf_query_result \
import UDFQueryResult
from collections import OrderedDict

Expand Down Expand Up @@ -108,7 +108,7 @@ def run(ctx: UDFContext):
def test_fetch_as_dataframe_after_last_batch():
def udf_wrapper():
from exasol_udf_mock_python.udf_context import UDFContext
from exasol.analytics.query_handler.result.udf_query_result \
from exasol.analytics.query_handler.query.result.udf_query_result \
import UDFQueryResult
from collections import OrderedDict

Expand Down Expand Up @@ -142,7 +142,7 @@ def run(ctx: UDFContext):
def test_fetch_as_dataframe_all_rows():
def udf_wrapper():
from exasol_udf_mock_python.udf_context import UDFContext
from exasol.analytics.query_handler.result.udf_query_result \
from exasol.analytics.query_handler.query.result.udf_query_result \
import UDFQueryResult
from collections import OrderedDict

Expand Down Expand Up @@ -173,7 +173,7 @@ def run(ctx: UDFContext):
def test_fetch_as_dataframe_start_col():
def udf_wrapper():
from exasol_udf_mock_python.udf_context import UDFContext
from exasol.analytics.query_handler.result.udf_query_result \
from exasol.analytics.query_handler.query.result.udf_query_result \
import UDFQueryResult
from collections import OrderedDict

Expand Down Expand Up @@ -203,7 +203,7 @@ def run(ctx: UDFContext):
def test_rowcount():
def udf_wrapper():
from exasol_udf_mock_python.udf_context import UDFContext
from exasol.analytics.query_handler.result.udf_query_result \
from exasol.analytics.query_handler.query.result.udf_query_result \
import UDFQueryResult
from collections import OrderedDict

Expand Down Expand Up @@ -231,7 +231,7 @@ def run(ctx: UDFContext):
def test_column_names():
def udf_wrapper():
from exasol_udf_mock_python.udf_context import UDFContext
from exasol.analytics.query_handler.result.udf_query_result \
from exasol.analytics.query_handler.query.result.udf_query_result \
import UDFQueryResult
from collections import OrderedDict

Expand Down Expand Up @@ -260,7 +260,7 @@ def run(ctx: UDFContext):
def test_columns():
def udf_wrapper():
from exasol_udf_mock_python.udf_context import UDFContext
from exasol.analytics.query_handler.result.udf_query_result \
from exasol.analytics.query_handler.query.result.udf_query_result \
import UDFQueryResult
from collections import OrderedDict

Expand Down Expand Up @@ -290,7 +290,7 @@ def run(ctx: UDFContext):
def test_column_get_attr():
def udf_wrapper():
from exasol_udf_mock_python.udf_context import UDFContext
from exasol.analytics.query_handler.result.udf_query_result \
from exasol.analytics.query_handler.query.result.udf_query_result \
import UDFQueryResult
from collections import OrderedDict

Expand Down Expand Up @@ -323,7 +323,7 @@ def run(ctx: UDFContext):
def test_column_get_item():
def udf_wrapper():
from exasol_udf_mock_python.udf_context import UDFContext
from exasol.analytics.query_handler.result.udf_query_result \
from exasol.analytics.query_handler.query.result.udf_query_result \
import UDFQueryResult
from collections import OrderedDict

Expand Down Expand Up @@ -356,7 +356,7 @@ def run(ctx: UDFContext):
def test_column_next_get_item():
def udf_wrapper():
from exasol_udf_mock_python.udf_context import UDFContext
from exasol.analytics.query_handler.result.udf_query_result \
from exasol.analytics.query_handler.query.result.udf_query_result \
import UDFQueryResult
from collections import OrderedDict

Expand Down Expand Up @@ -392,7 +392,7 @@ def run(ctx: UDFContext):
def test_column_next_get_attr():
def udf_wrapper():
from exasol_udf_mock_python.udf_context import UDFContext
from exasol.analytics.query_handler.result.udf_query_result \
from exasol.analytics.query_handler.query.result.udf_query_result \
import UDFQueryResult
from collections import OrderedDict

Expand Down Expand Up @@ -428,7 +428,7 @@ def run(ctx: UDFContext):
def test_column_iterator():
def udf_wrapper():
from exasol_udf_mock_python.udf_context import UDFContext
from exasol.analytics.query_handler.result.udf_query_result \
from exasol.analytics.query_handler.query.result.udf_query_result \
import UDFQueryResult
from collections import OrderedDict

Expand Down
4 changes: 2 additions & 2 deletions tests/unit_tests/udf_framework/mock_query_handlers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

from exasol.analytics.query_handler.context.scope import ScopeQueryHandlerContext
from exasol.analytics.query_handler.query.select import SelectQueryWithColumnDefinition, SelectQuery
from exasol.analytics.query_handler.result.impl import Finish, Continue
from exasol.analytics.query_handler.result.interface import QueryResult
from exasol.analytics.query_handler.result import Finish, Continue
from exasol.analytics.query_handler.query.result.interface import QueryResult
from exasol.analytics.query_handler.udf.interface import UDFQueryHandler
from exasol.analytics.query_handler.udf.interface import UDFQueryHandlerFactory

Expand Down
6 changes: 3 additions & 3 deletions tests/unit_tests/udf_framework/test_json_udf_query_handler.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

from exasol.analytics.query_handler.context.scope import ScopeQueryHandlerContext
from exasol.analytics.query_handler.json_udf_query_handler import JSONQueryHandler, JSONType
from exasol.analytics.query_handler.result.impl import Continue, Finish
from exasol.analytics.query_handler.result.python_query_result import PythonQueryResult
from exasol.analytics.query_handler.result.interface import QueryResult
from exasol.analytics.query_handler.result import Continue, Finish
from exasol.analytics.query_handler.query.result.python_query_result import PythonQueryResult
from exasol.analytics.query_handler.query.result.interface import QueryResult
from exasol.analytics.query_handler.udf.json_impl import JsonUDFQueryHandler


Expand Down
6 changes: 3 additions & 3 deletions tests/unit_tests/udf_framework/test_json_udf_query_handler_factory.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

from exasol.analytics.query_handler.context.scope import ScopeQueryHandlerContext
from exasol.analytics.query_handler.json_udf_query_handler import JSONQueryHandler, JSONType
from exasol.analytics.query_handler.result.impl import Continue, Finish
from exasol.analytics.query_handler.result.python_query_result import PythonQueryResult
from exasol.analytics.query_handler.result.interface import QueryResult
from exasol.analytics.query_handler.result import Continue, Finish
from exasol.analytics.query_handler.query.result.python_query_result import PythonQueryResult
from exasol.analytics.query_handler.query.result.interface import QueryResult
from exasol.analytics.query_handler.udf.json_impl import JsonUDFQueryHandlerFactory
from exasol.analytics.query_handler.udf.interface import UDFQueryHandler

Expand Down

0 comments on commit d95d2f8

Please sign in to comment.