Commit b094ffc3 by Lukáš Lalinský

Upgrade to Avatica 1.10

parent ec705f0a
Pipeline #18683 failed with stages
in 1 minute 28 seconds
......@@ -63,8 +63,11 @@ and run the script.
If you need a Phoenix query server for experimenting, you can get one running
quickly using `Docker <https://www.docker.com/>`_::
docker pull docker.oxygene.sk/lukas/python-phoenixdb/phoenix:4.11
docker run -p 127.0.0.1:8765:8765 docker.oxygene.sk/lukas/python-phoenixdb/phoenix:4.11
docker-compose up
Or if you need an older version of Phoenix::
PHOENIX_VERSION=4.9 docker-compose up
Interactive SQL shell
---------------------
......
version: "3"
services:
phoenix:
image: docker.oxygene.sk/lukas/python-phoenixdb/phoenix:${PHOENIX_VERSION:-4.11}
ports:
- "127.0.0.1:8765:8765"
#!/usr/bin/env bash
export CALCITE_VER=calcite-1.8.0
AVATICA_VER=rel/avatica-1.10.0
set -e
rm -rf phoenixdb/calcite
rm -rf calcite-tmp
git init calcite-tmp
mkdir calcite-tmp
cd calcite-tmp
git remote add origin https://github.com/apache/calcite/
git config core.sparsecheckout true
echo "avatica/core/src/main/protobuf/*" >> .git/info/sparse-checkout
git pull --depth=1 origin $CALCITE_VER
wget -O avatica.tar.gz https://github.com/apache/calcite-avatica/archive/$AVATICA_VER.tar.gz
tar -x --strip-components=1 -f avatica.tar.gz
cd ..
mkdir -p phoenixdb/calcite
protoc --proto_path=calcite-tmp/avatica/core/src/main/protobuf/ --python_out=phoenixdb/calcite calcite-tmp/avatica/core/src/main/protobuf/*.proto
protoc --proto_path=calcite-tmp/core/src/main/protobuf/ --python_out=phoenixdb/calcite calcite-tmp/core/src/main/protobuf/*.proto
sed -i 's/import common_pb2/from . import common_pb2/' phoenixdb/calcite/*_pb2.py
rm -rf calcite-tmp
......
from .client import AvaticaClient
......@@ -21,7 +21,7 @@ import math
import logging
import time
from phoenixdb import errors
from phoenixdb.calcite import requests_pb2, common_pb2, responses_pb2
from phoenixdb.avatica.proto import requests_pb2, common_pb2, responses_pb2
try:
import httplib
......
......@@ -16,7 +16,7 @@ import logging
import uuid
import weakref
from phoenixdb import errors
from phoenixdb.avatica import OPEN_CONNECTION_PROPERTIES
from phoenixdb.avatica.client import OPEN_CONNECTION_PROPERTIES
from phoenixdb.cursor import Cursor
from phoenixdb.errors import ProgrammingError
......
......@@ -16,7 +16,7 @@ import logging
import collections
from phoenixdb.types import TypeHelper
from phoenixdb.errors import ProgrammingError, InternalError
from phoenixdb.calcite import common_pb2
from phoenixdb.avatica.proto import common_pb2
__all__ = ['Cursor', 'ColumnDescription', 'DictCursor']
......
import unittest
from phoenixdb.avatica import parse_url, urlparse
from phoenixdb.avatica.client import parse_url, urlparse
class ParseUrlTest(unittest.TestCase):
......
......@@ -16,7 +16,7 @@ import sys
import time
import datetime
from decimal import Decimal
from phoenixdb.calcite import common_pb2
from phoenixdb.avatica.proto import common_pb2
__all__ = [
'Date', 'Time', 'Timestamp', 'DateFromTicks', 'TimeFromTicks', 'TimestampFromTicks',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment