This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 4.x in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push: new 960ae86 PHOENIX-5641 Decouple phoenix-queryserver from phoenix-core 960ae86 is described below commit 960ae86b6ec78f25e2db8d32e683e74d5f1044fc Author: Istvan Toth <st...@apache.org> AuthorDate: Fri Dec 20 07:38:02 2019 +0100 PHOENIX-5641 Decouple phoenix-queryserver from phoenix-core * remove config properties and defaults that were only used by PQS * remove the startup python scripts for the PQS server and client --- bin/queryserver.py | 214 --------------------- bin/sqlline-thin.py | 174 ----------------- .../org/apache/phoenix/query/QueryServices.java | 31 +-- .../apache/phoenix/query/QueryServicesOptions.java | 39 +--- 4 files changed, 2 insertions(+), 456 deletions(-) diff --git a/bin/queryserver.py b/bin/queryserver.py deleted file mode 100755 index 11cfc1a..0000000 --- a/bin/queryserver.py +++ /dev/null @@ -1,214 +0,0 @@ -#!/usr/bin/env python -############################################################################ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -############################################################################ - -# -# Script to handle launching the query server process. -# -# usage: queryserver.py [start|stop|makeWinServiceDesc] [-Dhadoop=configs] -# - -import datetime -import getpass -import os -import os.path -import signal -import subprocess -import sys -import tempfile - -try: - import daemon - daemon_supported = True -except ImportError: - # daemon script not supported on some platforms (windows?) - daemon_supported = False - -import phoenix_utils - -phoenix_utils.setPath() - -command = None -args = sys.argv - -if len(args) > 1: - if args[1] == 'start': - command = 'start' - elif args[1] == 'stop': - command = 'stop' - elif args[1] == 'makeWinServiceDesc': - command = 'makeWinServiceDesc' - -if command: - # Pull off queryserver.py and the command - args = args[2:] -else: - # Just pull off queryserver.py - args = args[1:] - -if os.name == 'nt': - args = subprocess.list2cmdline(args) -else: - import pipes # pipes module isn't available on Windows - args = " ".join([pipes.quote(v) for v in args]) - -# HBase configuration folder path (where hbase-site.xml reside) for -# HBase/Phoenix client side property override -hbase_config_path = phoenix_utils.hbase_conf_dir -hadoop_config_path = phoenix_utils.hadoop_conf -hadoop_classpath = phoenix_utils.hadoop_classpath - -# TODO: add windows support -phoenix_file_basename = 'phoenix-%s-queryserver' % getpass.getuser() -phoenix_log_file = '%s.log' % phoenix_file_basename -phoenix_out_file = '%s.out' % phoenix_file_basename -phoenix_pid_file = '%s.pid' % phoenix_file_basename - -# load hbase-env.??? to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR -hbase_env_path = None -hbase_env_cmd = None -if os.name == 'posix': - hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh') - hbase_env_cmd = ['bash', '-c', 'source %s && env' % hbase_env_path] -elif os.name == 'nt': - hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.cmd') - hbase_env_cmd = ['cmd.exe', '/c', 'call %s & set' % hbase_env_path] -if not hbase_env_path or not hbase_env_cmd: - print >> sys.stderr, "hbase-env file unknown on platform %s" % os.name - sys.exit(-1) - -hbase_env = {} -if os.path.isfile(hbase_env_path): - p = subprocess.Popen(hbase_env_cmd, stdout = subprocess.PIPE) - for x in p.stdout: - (k, _, v) = x.partition('=') - hbase_env[k.strip()] = v.strip() - -java_home = hbase_env.get('JAVA_HOME') or os.getenv('JAVA_HOME') -if java_home: - java = os.path.join(java_home, 'bin', 'java') -else: - java = 'java' - -tmp_dir = os.path.join(tempfile.gettempdir(), 'phoenix') -opts = os.getenv('PHOENIX_QUERYSERVER_OPTS') or hbase_env.get('PHOENIX_QUERYSERVER_OPTS') or '' -pid_dir = os.getenv('PHOENIX_QUERYSERVER_PID_DIR') or hbase_env.get('HBASE_PID_DIR') or tmp_dir -log_dir = os.getenv('PHOENIX_QUERYSERVER_LOG_DIR') or hbase_env.get('HBASE_LOG_DIR') or tmp_dir -pid_file_path = os.path.join(pid_dir, phoenix_pid_file) -log_file_path = os.path.join(log_dir, phoenix_log_file) -out_file_path = os.path.join(log_dir, phoenix_out_file) - -# " -Xdebug -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=n " + \ -# " -XX:+UnlockCommercialFeatures -XX:+FlightRecorder -XX:FlightRecorderOptions=defaultrecording=true,dumponexit=true" + \ - -# The command is run through subprocess so environment variables are automatically inherited -java_cmd = '%(java)s -cp ' + hbase_config_path + os.pathsep + hadoop_config_path + os.pathsep + \ - phoenix_utils.phoenix_client_jar + os.pathsep + phoenix_utils.phoenix_loadbalancer_jar + \ - os.pathsep + phoenix_utils.phoenix_queryserver_jar + os.pathsep + hadoop_classpath + \ - " -Dproc_phoenixserver" + \ - " -Dlog4j.configuration=file:" + os.path.join(phoenix_utils.current_dir, "log4j.properties") + \ - " -Dpsql.root.logger=%(root_logger)s" + \ - " -Dpsql.log.dir=%(log_dir)s" + \ - " -Dpsql.log.file=%(log_file)s" + \ - " " + opts + \ - " org.apache.phoenix.queryserver.server.QueryServer " + args - -if command == 'makeWinServiceDesc': - cmd = java_cmd % {'java': java, 'root_logger': 'INFO,DRFA,console', 'log_dir': log_dir, 'log_file': phoenix_log_file} - slices = cmd.split(' ') - - print "<service>" - print " <id>queryserver</id>" - print " <name>Phoenix Query Server</name>" - print " <description>This service runs the Phoenix Query Server.</description>" - print " <executable>%s</executable>" % slices[0] - print " <arguments>%s</arguments>" % ' '.join(slices[1:]) - print "</service>" - sys.exit() - -if command == 'start': - if not daemon_supported: - print >> sys.stderr, "daemon mode not supported on this platform" - sys.exit(-1) - - # get the current umask for the sub process - current_umask = os.umask(0) - os.umask(current_umask) - - # run in the background - d = os.path.dirname(out_file_path) - if not os.path.exists(d): - os.makedirs(d) - with open(out_file_path, 'a+') as out: - context = daemon.DaemonContext( - pidfile = daemon.PidFile(pid_file_path, 'Query Server already running, PID file found: %s' % pid_file_path), - stdout = out, - stderr = out, - ) - print 'starting Query Server, logging to %s' % log_file_path - with context: - # this block is the main() for the forked daemon process - child = None - cmd = java_cmd % {'java': java, 'root_logger': 'INFO,DRFA', 'log_dir': log_dir, 'log_file': phoenix_log_file} - - # notify the child when we're killed - def handler(signum, frame): - if child: - child.send_signal(signum) - sys.exit(0) - signal.signal(signal.SIGTERM, handler) - - def initsubproc(): - # set the parent's umask - os.umask(current_umask) - - print '%s launching %s' % (datetime.datetime.now(), cmd) - child = subprocess.Popen(cmd.split(), preexec_fn=initsubproc) - sys.exit(child.wait()) - -elif command == 'stop': - if not daemon_supported: - print >> sys.stderr, "daemon mode not supported on this platform" - sys.exit(-1) - - if not os.path.exists(pid_file_path): - print >> sys.stderr, "no Query Server to stop because PID file not found, %s" % pid_file_path - sys.exit(0) - - if not os.path.isfile(pid_file_path): - print >> sys.stderr, "PID path exists but is not a file! %s" % pid_file_path - sys.exit(1) - - pid = None - with open(pid_file_path, 'r') as p: - pid = int(p.read()) - if not pid: - sys.exit("cannot read PID file, %s" % pid_file_path) - - print "stopping Query Server pid %s" % pid - with open(out_file_path, 'a+') as out: - print >> out, "%s terminating Query Server" % datetime.datetime.now() - os.kill(pid, signal.SIGTERM) - -else: - # run in the foreground using defaults from log4j.properties - cmd = java_cmd % {'java': java, 'root_logger': 'INFO,console', 'log_dir': '.', 'log_file': 'psql.log'} - splitcmd = cmd.split() - os.execvp(splitcmd[0], splitcmd) diff --git a/bin/sqlline-thin.py b/bin/sqlline-thin.py deleted file mode 100755 index f6f9ff1..0000000 --- a/bin/sqlline-thin.py +++ /dev/null @@ -1,174 +0,0 @@ -#!/usr/bin/env python -############################################################################ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -############################################################################ - -import os -import subprocess -import sys -import phoenix_utils -import atexit -import urlparse - -# import argparse -try: - import argparse -except ImportError: - current_dir = os.path.dirname(os.path.abspath(__file__)) - sys.path.append(os.path.join(current_dir, 'argparse-1.4.0')) - import argparse - -global childProc -childProc = None -def kill_child(): - if childProc is not None: - childProc.terminate() - childProc.kill() - if os.name != 'nt': - os.system("reset") -atexit.register(kill_child) - -parser = argparse.ArgumentParser(description='Launches the Apache Phoenix Thin Client.') -# Positional argument "url" is optional -parser.add_argument('url', nargs='?', help='The URL to the Phoenix Query Server.', default='http://localhost:8765') -# Positional argument "sqlfile" is optional -parser.add_argument('sqlfile', nargs='?', help='A file of SQL commands to execute.', default='') -# Avatica wire authentication -parser.add_argument('-a', '--authentication', help='Mechanism for HTTP authentication.', choices=('SPNEGO', 'BASIC', 'DIGEST', 'NONE'), default='') -# Avatica wire serialization -parser.add_argument('-s', '--serialization', help='Serialization type for HTTP API.', choices=('PROTOBUF', 'JSON'), default=None) -# Avatica authentication -parser.add_argument('-au', '--auth-user', help='Username for HTTP authentication.') -parser.add_argument('-ap', '--auth-password', help='Password for HTTP authentication.') -# Common arguments across sqlline.py and sqlline-thin.py -phoenix_utils.common_sqlline_args(parser) -# Parse the args -args=parser.parse_args() - -phoenix_utils.setPath() - -url = args.url -sqlfile = args.sqlfile -serialization_key = 'phoenix.queryserver.serialization' - -def cleanup_url(url): - parsed = urlparse.urlparse(url) - if parsed.scheme == "": - url = "http://" + url - parsed = urlparse.urlparse(url) - if ":" not in parsed.netloc: - url = url + ":8765" - return url - -def get_serialization(): - default_serialization='PROTOBUF' - env=os.environ.copy() - if os.name == 'posix': - hbase_exec_name = 'hbase' - elif os.name == 'nt': - hbase_exec_name = 'hbase.cmd' - else: - print 'Unknown platform "%s", defaulting to HBase executable of "hbase"' % os.name - hbase_exec_name = 'hbase' - - hbase_cmd = phoenix_utils.which(hbase_exec_name) - if hbase_cmd is None: - print 'Failed to find hbase executable on PATH, defaulting serialization to %s.' % default_serialization - return default_serialization - - env['HBASE_CONF_DIR'] = phoenix_utils.hbase_conf_dir - proc = subprocess.Popen([hbase_cmd, 'org.apache.hadoop.hbase.util.HBaseConfTool', serialization_key], - env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - (stdout, stderr) = proc.communicate() - if proc.returncode != 0: - print 'Failed to extract serialization from hbase-site.xml, defaulting to %s.' % default_serialization - return default_serialization - # Don't expect this to happen, but give a default value just in case - if stdout is None: - return default_serialization - - stdout = stdout.strip() - if stdout == 'null': - return default_serialization - return stdout - -url = cleanup_url(url) - -if sqlfile != "": - sqlfile = "--run=" + sqlfile - -colorSetting = args.color -# disable color setting for windows OS -if os.name == 'nt': - colorSetting = "false" - -# HBase configuration folder path (where hbase-site.xml reside) for -# HBase/Phoenix client side property override -hbase_config_path = os.getenv('HBASE_CONF_DIR', phoenix_utils.current_dir) - -serialization = args.serialization if args.serialization else get_serialization() - -java_home = os.getenv('JAVA_HOME') - -# load hbase-env.??? to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR -hbase_env_path = None -hbase_env_cmd = None -if os.name == 'posix': - hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh') - hbase_env_cmd = ['bash', '-c', 'source %s && env' % hbase_env_path] -elif os.name == 'nt': - hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.cmd') - hbase_env_cmd = ['cmd.exe', '/c', 'call %s & set' % hbase_env_path] -if not hbase_env_path or not hbase_env_cmd: - print >> sys.stderr, "hbase-env file unknown on platform %s" % os.name - sys.exit(-1) - -hbase_env = {} -if os.path.isfile(hbase_env_path): - p = subprocess.Popen(hbase_env_cmd, stdout = subprocess.PIPE) - for x in p.stdout: - (k, _, v) = x.partition('=') - hbase_env[k.strip()] = v.strip() - -if hbase_env.has_key('JAVA_HOME'): - java_home = hbase_env['JAVA_HOME'] - -if java_home: - java = os.path.join(java_home, 'bin', 'java') -else: - java = 'java' - -jdbc_url = 'jdbc:phoenix:thin:url=' + url + ';serialization=' + serialization -if args.authentication: - jdbc_url += ';authentication=' + args.authentication -if args.auth_user: - jdbc_url += ';avatica_user=' + args.auth_user -if args.auth_password: - jdbc_url += ';avatica_password=' + args.auth_password - -java_cmd = java + ' $PHOENIX_OPTS ' + \ - ' -cp "' + phoenix_utils.hbase_conf_dir + os.pathsep + phoenix_utils.phoenix_thin_client_jar + \ - os.pathsep + phoenix_utils.hadoop_conf + os.pathsep + phoenix_utils.hadoop_classpath + '" -Dlog4j.configuration=file:' + \ - os.path.join(phoenix_utils.current_dir, "log4j.properties") + \ - " org.apache.phoenix.queryserver.client.SqllineWrapper -d org.apache.phoenix.queryserver.client.Driver " + \ - ' -u "' + jdbc_url + '"' + " -n none -p none " + \ - " --color=" + colorSetting + " --fastConnect=" + args.fastconnect + " --verbose=" + args.verbose + \ - " --incremental=false --isolation=TRANSACTION_READ_COMMITTED " + sqlfile - -os.execl("/bin/sh", "/bin/sh", "-c", java_cmd) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java index 77adc4f..5a601c2 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java @@ -245,31 +245,6 @@ public interface QueryServices extends SQLCloseable { public static final String MAX_VERSIONS_TRANSACTIONAL_ATTRIB = "phoenix.transactions.maxVersions"; - // queryserver configuration keys - public static final String QUERY_SERVER_SERIALIZATION_ATTRIB = "phoenix.queryserver.serialization"; - public static final String QUERY_SERVER_META_FACTORY_ATTRIB = "phoenix.queryserver.metafactory.class"; - public static final String QUERY_SERVER_HTTP_PORT_ATTRIB = "phoenix.queryserver.http.port"; - public static final String QUERY_SERVER_ENV_LOGGING_ATTRIB = "phoenix.queryserver.envvars.logging.disabled"; - public static final String QUERY_SERVER_ENV_LOGGING_SKIPWORDS_ATTRIB = "phoenix.queryserver.envvars.logging.skipwords"; - public static final String QUERY_SERVER_KEYTAB_FILENAME_ATTRIB = "phoenix.queryserver.keytab.file"; - public static final String QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB = "phoenix.queryserver.http.keytab.file"; - public static final String QUERY_SERVER_KERBEROS_PRINCIPAL_ATTRIB = "phoenix.queryserver.kerberos.principal"; - public static final String QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB_LEGACY = "phoenix.queryserver.kerberos.http.principal"; - public static final String QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB = "phoenix.queryserver.http.kerberos.principal"; - public static final String QUERY_SERVER_DNS_NAMESERVER_ATTRIB = "phoenix.queryserver.dns.nameserver"; - public static final String QUERY_SERVER_DNS_INTERFACE_ATTRIB = "phoenix.queryserver.dns.interface"; - public static final String QUERY_SERVER_HBASE_SECURITY_CONF_ATTRIB = "hbase.security.authentication"; - public static final String QUERY_SERVER_UGI_CACHE_MAX_SIZE = "phoenix.queryserver.ugi.cache.max.size"; - public static final String QUERY_SERVER_UGI_CACHE_INITIAL_SIZE = "phoenix.queryserver.ugi.cache.initial.size"; - public static final String QUERY_SERVER_UGI_CACHE_CONCURRENCY = "phoenix.queryserver.ugi.cache.concurrency"; - public static final String QUERY_SERVER_KERBEROS_ALLOWED_REALMS = "phoenix.queryserver.kerberos.allowed.realms"; - public static final String QUERY_SERVER_SPNEGO_AUTH_DISABLED_ATTRIB = "phoenix.queryserver.spnego.auth.disabled"; - public static final String QUERY_SERVER_WITH_REMOTEUSEREXTRACTOR_ATTRIB = "phoenix.queryserver.withRemoteUserExtractor"; - public static final String QUERY_SERVER_CUSTOMIZERS_ENABLED = "phoenix.queryserver.customizers.enabled"; - public static final String QUERY_SERVER_CUSTOM_AUTH_ENABLED = "phoenix.queryserver.custom.auth.enabled"; - public static final String QUERY_SERVER_REMOTEUSEREXTRACTOR_PARAM = "phoenix.queryserver.remoteUserExtractor.param"; - public static final String QUERY_SERVER_DISABLE_KERBEROS_LOGIN = "phoenix.queryserver.disable.kerberos.login"; - // metadata configs public static final String DEFAULT_SYSTEM_KEEP_DELETED_CELLS_ATTRIB = "phoenix.system.default.keep.deleted.cells"; public static final String DEFAULT_SYSTEM_MAX_VERSIONS_ATTRIB = "phoenix.system.default.max.versions"; @@ -311,11 +286,7 @@ public interface QueryServices extends SQLCloseable { public static final String DEFAULT_IMMUTABLE_STORAGE_SCHEME_ATTRIB = "phoenix.default.immutable.storage.scheme"; public static final String DEFAULT_MULTITENANT_IMMUTABLE_STORAGE_SCHEME_ATTRIB = "phoenix.default.multitenant.immutable.storage.scheme"; - public static final String PHOENIX_QUERY_SERVER_LOADBALANCER_ENABLED = "phoenix.queryserver.loadbalancer.enabled"; - public static final String PHOENIX_QUERY_SERVER_CLUSTER_BASE_PATH = "phoenix.queryserver.base.path"; - public static final String PHOENIX_QUERY_SERVER_SERVICE_NAME = "phoenix.queryserver.service.name"; - public static final String PHOENIX_QUERY_SERVER_ZK_ACL_USERNAME = "phoenix.queryserver.zookeeper.acl.username"; - public static final String PHOENIX_QUERY_SERVER_ZK_ACL_PASSWORD = "phoenix.queryserver.zookeeper.acl.password"; + public static final String STATS_COLLECTION_ENABLED = "phoenix.stats.collection.enabled"; public static final String USE_STATS_FOR_PARALLELIZATION = "phoenix.use.stats.parallelization"; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java index cfa0aec..cc42ca7 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java @@ -64,11 +64,6 @@ import static org.apache.phoenix.query.QueryServices.MIN_STATS_UPDATE_FREQ_MS_AT import static org.apache.phoenix.query.QueryServices.MUTATE_BATCH_SIZE_ATTRIB; import static org.apache.phoenix.query.QueryServices.NUM_RETRIES_FOR_SCHEMA_UPDATE_CHECK; import static org.apache.phoenix.query.QueryServices.PHOENIX_ACLS_ENABLED; -import static org.apache.phoenix.query.QueryServices.PHOENIX_QUERY_SERVER_CLUSTER_BASE_PATH; -import static org.apache.phoenix.query.QueryServices.PHOENIX_QUERY_SERVER_LOADBALANCER_ENABLED; -import static org.apache.phoenix.query.QueryServices.PHOENIX_QUERY_SERVER_SERVICE_NAME; -import static org.apache.phoenix.query.QueryServices.PHOENIX_QUERY_SERVER_ZK_ACL_PASSWORD; -import static org.apache.phoenix.query.QueryServices.PHOENIX_QUERY_SERVER_ZK_ACL_USERNAME; import static org.apache.phoenix.query.QueryServices.QUEUE_SIZE_ATTRIB; import static org.apache.phoenix.query.QueryServices.REGIONSERVER_INFO_PORT_ATTRIB; import static org.apache.phoenix.query.QueryServices.RENEW_LEASE_ENABLED; @@ -304,20 +299,6 @@ public class QueryServicesOptions { public static final long DEFAULT_INDEX_POPULATION_SLEEP_TIME = 5000; - // QueryServer defaults -- ensure ThinClientUtil is also updated since phoenix-queryserver-client - // doesn't depend on phoenix-core. - public static final String DEFAULT_QUERY_SERVER_SERIALIZATION = "PROTOBUF"; - public static final int DEFAULT_QUERY_SERVER_HTTP_PORT = 8765; - public static final long DEFAULT_QUERY_SERVER_UGI_CACHE_MAX_SIZE = 1000L; - public static final int DEFAULT_QUERY_SERVER_UGI_CACHE_INITIAL_SIZE = 100; - public static final int DEFAULT_QUERY_SERVER_UGI_CACHE_CONCURRENCY = 10; - public static final boolean DEFAULT_QUERY_SERVER_SPNEGO_AUTH_DISABLED = false; - public static final boolean DEFAULT_QUERY_SERVER_WITH_REMOTEUSEREXTRACTOR = false; - public static final boolean DEFAULT_QUERY_SERVER_CUSTOM_AUTH_ENABLED = false; - public static final String DEFAULT_QUERY_SERVER_REMOTEUSEREXTRACTOR_PARAM = "doAs"; - public static final boolean DEFAULT_QUERY_SERVER_DISABLE_KERBEROS_LOGIN = false; - public static final boolean DEFAULT_QUERY_SERVER_CUSTOMIZERS_ENABLED = false; - public static final boolean DEFAULT_RENEW_LEASE_ENABLED = true; public static final int DEFAULT_RUN_RENEW_LEASE_FREQUENCY_INTERVAL_MILLISECONDS = DEFAULT_HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD / 2; @@ -335,11 +316,7 @@ public class QueryServicesOptions { public static final int DEFAULT_COLUMN_ENCODED_BYTES = QualifierEncodingScheme.TWO_BYTE_QUALIFIERS.getSerializedMetadataValue(); public static final String DEFAULT_IMMUTABLE_STORAGE_SCHEME = ImmutableStorageScheme.SINGLE_CELL_ARRAY_WITH_OFFSETS.toString(); public static final String DEFAULT_MULTITENANT_IMMUTABLE_STORAGE_SCHEME = ImmutableStorageScheme.ONE_CELL_PER_COLUMN.toString(); - public static final boolean DEFAULT_PHOENIX_QUERY_SERVER_LOADBALANCER_ENABLED = false; - public static final String DEFAULT_PHOENIX_QUERY_SERVER_CLUSTER_BASE_PATH = "/phoenix"; - public static final String DEFAULT_PHOENIX_QUERY_SERVER_SERVICE_NAME = "queryserver"; - public static final String DEFAULT_PHOENIX_QUERY_SERVER_ZK_ACL_USERNAME = "phoenix"; - public static final String DEFAULT_PHOENIX_QUERY_SERVER_ZK_ACL_PASSWORD = "phoenix"; + //by default, max connections from one client to one cluster is unlimited public static final int DEFAULT_CLIENT_CONNECTION_MAX_ALLOWED_CONNECTIONS = 0; @@ -368,15 +345,6 @@ public class QueryServicesOptions { public static final boolean DEFAULT_PROPERTY_POLICY_PROVIDER_ENABLED = true; - @SuppressWarnings("serial") - public static final Set<String> DEFAULT_QUERY_SERVER_SKIP_WORDS = new HashSet<String>() { - { - add("secret"); - add("passwd"); - add("password"); - add("credential"); - } - }; public static final String DEFAULT_SCHEMA = null; public static final String DEFAULT_UPLOAD_BINARY_DATA_TYPE_ENCODING = "BASE64"; // for backward compatibility, till // 4.10, psql and CSVBulkLoad @@ -471,11 +439,6 @@ public class QueryServicesOptions { .setIfUnset(IS_SYSTEM_TABLE_MAPPED_TO_NAMESPACE, DEFAULT_IS_SYSTEM_TABLE_MAPPED_TO_NAMESPACE) .setIfUnset(LOCAL_INDEX_CLIENT_UPGRADE_ATTRIB, DEFAULT_LOCAL_INDEX_CLIENT_UPGRADE) .setIfUnset(AUTO_UPGRADE_ENABLED, DEFAULT_AUTO_UPGRADE_ENABLED) - .setIfUnset(PHOENIX_QUERY_SERVER_LOADBALANCER_ENABLED, DEFAULT_PHOENIX_QUERY_SERVER_LOADBALANCER_ENABLED) - .setIfUnset(PHOENIX_QUERY_SERVER_CLUSTER_BASE_PATH, DEFAULT_PHOENIX_QUERY_SERVER_CLUSTER_BASE_PATH) - .setIfUnset(PHOENIX_QUERY_SERVER_SERVICE_NAME, DEFAULT_PHOENIX_QUERY_SERVER_SERVICE_NAME) - .setIfUnset(PHOENIX_QUERY_SERVER_ZK_ACL_USERNAME, DEFAULT_PHOENIX_QUERY_SERVER_ZK_ACL_USERNAME) - .setIfUnset(PHOENIX_QUERY_SERVER_ZK_ACL_PASSWORD, DEFAULT_PHOENIX_QUERY_SERVER_ZK_ACL_PASSWORD) .setIfUnset(UPLOAD_BINARY_DATA_TYPE_ENCODING, DEFAULT_UPLOAD_BINARY_DATA_TYPE_ENCODING) .setIfUnset(TRACING_ENABLED, DEFAULT_TRACING_ENABLED) .setIfUnset(TRACING_BATCH_SIZE, DEFAULT_TRACING_BATCH_SIZE)