[6/8] impala git commit: IMPALA-6999: Upgrade to sqlparse-0.1.19 for Impala shell

2018-05-11 Thread tarmstrong
http://git-wip-us.apache.org/repos/asf/impala/blob/417bc8c8/shell/ext-py/sqlparse-0.1.14/sqlparse/utils.py
--
diff --git a/shell/ext-py/sqlparse-0.1.14/sqlparse/utils.py 
b/shell/ext-py/sqlparse-0.1.14/sqlparse/utils.py
deleted file mode 100644
index 3a49ac2..000
--- a/shell/ext-py/sqlparse-0.1.14/sqlparse/utils.py
+++ /dev/null
@@ -1,137 +0,0 @@
-'''
-Created on 17/05/2012
-
-@author: piranna
-'''
-
-import re
-
-try:
-from collections import OrderedDict
-except ImportError:
-OrderedDict = None
-
-
-if OrderedDict:
-class Cache(OrderedDict):
-"""Cache with LRU algorithm using an OrderedDict as basis
-"""
-def __init__(self, maxsize=100):
-OrderedDict.__init__(self)
-
-self._maxsize = maxsize
-
-def __getitem__(self, key, *args, **kwargs):
-# Get the key and remove it from the cache, or raise KeyError
-value = OrderedDict.__getitem__(self, key)
-del self[key]
-
-# Insert the (key, value) pair on the front of the cache
-OrderedDict.__setitem__(self, key, value)
-
-# Return the value from the cache
-return value
-
-def __setitem__(self, key, value, *args, **kwargs):
-# Key was inserted before, remove it so we put it at front later
-if key in self:
-del self[key]
-
-# Too much items on the cache, remove the least recent used
-elif len(self) >= self._maxsize:
-self.popitem(False)
-
-# Insert the (key, value) pair on the front of the cache
-OrderedDict.__setitem__(self, key, value, *args, **kwargs)
-
-else:
-class Cache(dict):
-"""Cache that reset when gets full
-"""
-def __init__(self, maxsize=100):
-dict.__init__(self)
-
-self._maxsize = maxsize
-
-def __setitem__(self, key, value, *args, **kwargs):
-# Reset the cache if we have too much cached entries and start over
-if len(self) >= self._maxsize:
-self.clear()
-
-# Insert the (key, value) pair on the front of the cache
-dict.__setitem__(self, key, value, *args, **kwargs)
-
-
-def memoize_generator(func):
-"""Memoize decorator for generators
-
-Store `func` results in a cache according to their arguments as 'memoize'
-does but instead this works on decorators instead of regular functions.
-Obviusly, this is only useful if the generator will always return the same
-values for each specific parameters...
-"""
-cache = Cache()
-
-def wrapped_func(*args, **kwargs):
-#params = (args, kwargs)
-params = (args, tuple(sorted(kwargs.items(
-
-# Look if cached
-try:
-cached = cache[params]
-
-# Not cached, exec and store it
-except KeyError:
-cached = []
-
-for item in func(*args, **kwargs):
-cached.append(item)
-yield item
-
-cache[params] = cached
-
-# Cached, yield its items
-else:
-for item in cached:
-yield item
-
-return wrapped_func
-
-
-# This regular expression replaces the home-cooked parser that was here before.
-# It is much faster, but requires an extra post-processing step to get the
-# desired results (that are compatible with what you would expect from the
-# str.splitlines() method).
-#
-# It matches groups of characters: newlines, quoted strings, or unquoted text,
-# and splits on that basis. The post-processing step puts those back together
-# into the actual lines of SQL.
-SPLIT_REGEX = re.compile(r"""
-(
- (?: # Start of non-capturing group
-  (?:\r\n|\r|\n)  |  # Match any single newline, or
-  [^\r\n'"]+  |  # Match any character series without quotes or
- # newlines, or
-  "(?:[^"\\]|\\.)*"   |  # Match double-quoted strings, or
-  '(?:[^'\\]|\\.)*'  # Match single quoted strings
- )
-)
-""", re.VERBOSE)
-
-LINE_MATCH = re.compile(r'(\r\n|\r|\n)')
-
-def split_unquoted_newlines(text):
-"""Split a string on all unquoted newlines.
-
-Unlike str.splitlines(), this will ignore CR/LF/CR+LF if the requisite
-character is inside of a string."""
-lines = SPLIT_REGEX.split(text)
-outputlines = ['']
-for line in lines:
-if not line:
-continue
-elif LINE_MATCH.match(line):
-outputlines.append('')
-else:
-outputlines[-1] += line
-return outputlines
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/impala/blob/417bc8c8/shell/ext-py/sqlparse-0.1.14/tests/__init__.py
--
diff --git a/shell/ext-py/sqlparse-0.1.14/tests/__init__.py 

[6/8] impala git commit: IMPALA-6999: Upgrade to sqlparse-0.1.19 for Impala shell

2018-05-10 Thread joemcdonnell
http://git-wip-us.apache.org/repos/asf/impala/blob/49413d9c/shell/ext-py/sqlparse-0.1.14/sqlparse/utils.py
--
diff --git a/shell/ext-py/sqlparse-0.1.14/sqlparse/utils.py 
b/shell/ext-py/sqlparse-0.1.14/sqlparse/utils.py
deleted file mode 100644
index 3a49ac2..000
--- a/shell/ext-py/sqlparse-0.1.14/sqlparse/utils.py
+++ /dev/null
@@ -1,137 +0,0 @@
-'''
-Created on 17/05/2012
-
-@author: piranna
-'''
-
-import re
-
-try:
-from collections import OrderedDict
-except ImportError:
-OrderedDict = None
-
-
-if OrderedDict:
-class Cache(OrderedDict):
-"""Cache with LRU algorithm using an OrderedDict as basis
-"""
-def __init__(self, maxsize=100):
-OrderedDict.__init__(self)
-
-self._maxsize = maxsize
-
-def __getitem__(self, key, *args, **kwargs):
-# Get the key and remove it from the cache, or raise KeyError
-value = OrderedDict.__getitem__(self, key)
-del self[key]
-
-# Insert the (key, value) pair on the front of the cache
-OrderedDict.__setitem__(self, key, value)
-
-# Return the value from the cache
-return value
-
-def __setitem__(self, key, value, *args, **kwargs):
-# Key was inserted before, remove it so we put it at front later
-if key in self:
-del self[key]
-
-# Too much items on the cache, remove the least recent used
-elif len(self) >= self._maxsize:
-self.popitem(False)
-
-# Insert the (key, value) pair on the front of the cache
-OrderedDict.__setitem__(self, key, value, *args, **kwargs)
-
-else:
-class Cache(dict):
-"""Cache that reset when gets full
-"""
-def __init__(self, maxsize=100):
-dict.__init__(self)
-
-self._maxsize = maxsize
-
-def __setitem__(self, key, value, *args, **kwargs):
-# Reset the cache if we have too much cached entries and start over
-if len(self) >= self._maxsize:
-self.clear()
-
-# Insert the (key, value) pair on the front of the cache
-dict.__setitem__(self, key, value, *args, **kwargs)
-
-
-def memoize_generator(func):
-"""Memoize decorator for generators
-
-Store `func` results in a cache according to their arguments as 'memoize'
-does but instead this works on decorators instead of regular functions.
-Obviusly, this is only useful if the generator will always return the same
-values for each specific parameters...
-"""
-cache = Cache()
-
-def wrapped_func(*args, **kwargs):
-#params = (args, kwargs)
-params = (args, tuple(sorted(kwargs.items(
-
-# Look if cached
-try:
-cached = cache[params]
-
-# Not cached, exec and store it
-except KeyError:
-cached = []
-
-for item in func(*args, **kwargs):
-cached.append(item)
-yield item
-
-cache[params] = cached
-
-# Cached, yield its items
-else:
-for item in cached:
-yield item
-
-return wrapped_func
-
-
-# This regular expression replaces the home-cooked parser that was here before.
-# It is much faster, but requires an extra post-processing step to get the
-# desired results (that are compatible with what you would expect from the
-# str.splitlines() method).
-#
-# It matches groups of characters: newlines, quoted strings, or unquoted text,
-# and splits on that basis. The post-processing step puts those back together
-# into the actual lines of SQL.
-SPLIT_REGEX = re.compile(r"""
-(
- (?: # Start of non-capturing group
-  (?:\r\n|\r|\n)  |  # Match any single newline, or
-  [^\r\n'"]+  |  # Match any character series without quotes or
- # newlines, or
-  "(?:[^"\\]|\\.)*"   |  # Match double-quoted strings, or
-  '(?:[^'\\]|\\.)*'  # Match single quoted strings
- )
-)
-""", re.VERBOSE)
-
-LINE_MATCH = re.compile(r'(\r\n|\r|\n)')
-
-def split_unquoted_newlines(text):
-"""Split a string on all unquoted newlines.
-
-Unlike str.splitlines(), this will ignore CR/LF/CR+LF if the requisite
-character is inside of a string."""
-lines = SPLIT_REGEX.split(text)
-outputlines = ['']
-for line in lines:
-if not line:
-continue
-elif LINE_MATCH.match(line):
-outputlines.append('')
-else:
-outputlines[-1] += line
-return outputlines
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/impala/blob/49413d9c/shell/ext-py/sqlparse-0.1.14/tests/__init__.py
--
diff --git a/shell/ext-py/sqlparse-0.1.14/tests/__init__.py