You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ad...@apache.org on 2016/09/13 01:32:00 UTC
[13/50] [abbrv] drill git commit: Cleaning up code.
Cleaning up code.
Removed some unnecessary files from the module.
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/e19c048c
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/e19c048c
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/e19c048c
Branch: refs/heads/master
Commit: e19c048c4b3a78df6582531eaa80c188631657f7
Parents: 115a85e
Author: Aditya <ad...@mapr.com>
Authored: Thu Jul 16 17:59:52 2015 -0700
Committer: Aditya Kishore <ad...@apache.org>
Committed: Fri Sep 9 10:08:31 2016 -0700
----------------------------------------------------------------------
.../resources/bootstrap-storage-plugins.json | 12 --
.../src/main/resources/drill-module.conf | 16 +--
.../src/test/resources/hbase-site.xml | 143 -------------------
.../hbase/hbase_scan_screen_physical.json | 29 ----
...base_scan_screen_physical_column_select.json | 32 -----
...base_scan_screen_physical_family_select.json | 32 -----
6 files changed, 1 insertion(+), 263 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/e19c048c/contrib/format-maprdb/src/main/resources/bootstrap-storage-plugins.json
----------------------------------------------------------------------
diff --git a/contrib/format-maprdb/src/main/resources/bootstrap-storage-plugins.json b/contrib/format-maprdb/src/main/resources/bootstrap-storage-plugins.json
deleted file mode 100644
index 3e0e8c0..0000000
--- a/contrib/format-maprdb/src/main/resources/bootstrap-storage-plugins.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "storage":{
- hbase : {
- type:"hbase",
- enabled: false,
- config : {
- "hbase.zookeeper.quorum" : "localhost",
- "hbase.zookeeper.property.clientPort" : 2181
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/drill/blob/e19c048c/contrib/format-maprdb/src/main/resources/drill-module.conf
----------------------------------------------------------------------
diff --git a/contrib/format-maprdb/src/main/resources/drill-module.conf b/contrib/format-maprdb/src/main/resources/drill-module.conf
index 0edceaf..8d42355 100644
--- a/contrib/format-maprdb/src/main/resources/drill-module.conf
+++ b/contrib/format-maprdb/src/main/resources/drill-module.conf
@@ -17,18 +17,4 @@
// This file can also include any supplementary configuration information.
// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
-drill.exec: {
-
- sys.store.provider: {
- # HBasePStoreProvider is disabled by default
- # class: "org.apache.drill.exec.store.hbase.config.HBasePStoreProvider",
- hbase: {
- table : "drill_store",
- config : {
- "hbase.zookeeper.quorum" : "localhost",
- "hbase.zookeeper.property.clientPort" : 2181
- }
- }
- }
-
-}
+# This file currently does not contain any configuration
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/e19c048c/contrib/format-maprdb/src/test/resources/hbase-site.xml
----------------------------------------------------------------------
diff --git a/contrib/format-maprdb/src/test/resources/hbase-site.xml b/contrib/format-maprdb/src/test/resources/hbase-site.xml
deleted file mode 100644
index 54425d4..0000000
--- a/contrib/format-maprdb/src/test/resources/hbase-site.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Copyright 2010 The Apache Software Foundation
- *
- * 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.
- */
--->
-<configuration>
- <property>
- <name>hbase.regionserver.msginterval</name>
- <value>1000</value>
- <description>Interval between messages from the RegionServer to HMaster
- in milliseconds. Default is 15. Set this value low if you want unit
- tests to be responsive.
- </description>
- </property>
- <property>
- <name>hbase.client.pause</name>
- <value>1000</value>
- <description>General client pause value. Used mostly as value to wait
- before running a retry of a failed get, region lookup, etc.</description>
- </property>
- <property>
- <name>hbase.client.retries.number</name>
- <value>10</value>
- <description>Maximum retries. Used as maximum for all retryable
- operations such as fetching of the root region from root region
- server, getting a cell's value, starting a row update, etc.
- Default: 10.
- </description>
- </property>
- <property>
- <name>hbase.server.thread.wakefrequency</name>
- <value>1000</value>
- <description>Time to sleep in between searches for work (in milliseconds).
- Used as sleep interval by service threads such as META scanner and log roller.
- </description>
- </property>
- <property>
- <name>hbase.master.event.waiting.time</name>
- <value>50</value>
- <description>Time to sleep between checks to see if a table event took place.
- </description>
- </property>
- <property>
- <name>hbase.regionserver.handler.count</name>
- <value>5</value>
- <description>Count of RPC Server instances spun up on RegionServers
- Same property is used by the HMaster for count of master handlers.
- Default is 10.
- </description>
- </property>
-<!--
- <property>
- <name>hbase.master.info.port</name>
- <value>-1</value>
- <description>The port for the hbase master web UI
- Set to -1 if you do not want the info server to run.
- </description>
- </property>
--->
- <property>
- <name>hbase.regionserver.info.port</name>
- <value>-1</value>
- <description>The port for the hbase regionserver web UI
- Set to -1 if you do not want the info server to run.
- </description>
- </property>
- <property>
- <name>hbase.regionserver.info.port.auto</name>
- <value>true</value>
- <description>Info server auto port bind. Enables automatic port
- search if hbase.regionserver.info.port is already in use.
- Enabled for testing to run multiple tests on one machine.
- </description>
- </property>
- <property>
- <name>hbase.master.lease.thread.wakefrequency</name>
- <value>3000</value>
- <description>The interval between checks for expired region server leases.
- This value has been reduced due to the other reduced values above so that
- the master will notice a dead region server sooner. The default is 15 seconds.
- </description>
- </property>
- <property>
- <name>hbase.regionserver.safemode</name>
- <value>false</value>
- <description>
- Turn on/off safe mode in region server. Always on for production, always off
- for tests.
- </description>
- </property>
- <property>
- <name>hbase.hregion.max.filesize</name>
- <value>67108864</value>
- <description>
- Maximum desired file size for an HRegion. If filesize exceeds
- value + (value / 2), the HRegion is split in two. Default: 256M.
-
- Keep the maximum filesize small so we split more often in tests.
- </description>
- </property>
- <property>
- <name>hbase.zookeeper.property.clientPort</name>
- <value>2181</value>
- <description>Property from ZooKeeper's config zoo.cfg.
- The port at which the clients will connect.
- </description>
- </property>
- <property>
- <name>hbase.defaults.for.version.skip</name>
- <value>true</value>
- <description>
- Set to true to skip the 'hbase.defaults.for.version'.
- Setting this to true can be useful in contexts other than
- the other side of a maven generation; i.e. running in an
- ide. You'll want to set this boolean to true to avoid
- seeing the RuntimException complaint: "hbase-default.xml file
- seems to be for and old version of HBase (@@@VERSION@@@), this
- version is X.X.X-SNAPSHOT"
- </description>
- </property>
- <property>
- <name>hbase.ipc.client.fallback-to-simple-auth-allowed</name>
- <value>true</value>
- </property>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/e19c048c/contrib/format-maprdb/src/test/resources/hbase/hbase_scan_screen_physical.json
----------------------------------------------------------------------
diff --git a/contrib/format-maprdb/src/test/resources/hbase/hbase_scan_screen_physical.json b/contrib/format-maprdb/src/test/resources/hbase/hbase_scan_screen_physical.json
deleted file mode 100644
index 7f9015b..0000000
--- a/contrib/format-maprdb/src/test/resources/hbase/hbase_scan_screen_physical.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- head : {
- type : "APACHE_DRILL_PHYSICAL",
- version : 1,
- generator : {
- type : "manual"
- }
- },
- graph : [ {
- pop : "hbase-scan",
- @id : 1,
- hbaseScanSpec : {
- tableName : "[TABLE_NAME]"
- },
- storage:
- {
- "type":"hbase",
- config : {
- "hbase.zookeeper.quorum" : "localhost",
- "hbase.zookeeper.property.clientPort" : 2181
- }
- }
- },
- {
- pop : "screen",
- @id : 2,
- child : 1
- } ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/e19c048c/contrib/format-maprdb/src/test/resources/hbase/hbase_scan_screen_physical_column_select.json
----------------------------------------------------------------------
diff --git a/contrib/format-maprdb/src/test/resources/hbase/hbase_scan_screen_physical_column_select.json b/contrib/format-maprdb/src/test/resources/hbase/hbase_scan_screen_physical_column_select.json
deleted file mode 100644
index f399f6f..0000000
--- a/contrib/format-maprdb/src/test/resources/hbase/hbase_scan_screen_physical_column_select.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- head : {
- type : "APACHE_DRILL_PHYSICAL",
- version : 1,
- generator : {
- type : "manual"
- }
- },
- graph : [ {
- pop : "hbase-scan",
- @id : 1,
- hbaseScanSpec : {
- tableName : "[TABLE_NAME]"
- },
- storage:
- {
- "type":"hbase",
- config : {
- "hbase.zookeeper.quorum" : "localhost",
- "hbase.zookeeper.property.clientPort" : 2181
- }
- },
- columns: [
- "`f2`.c1", "`f2`.c2", "row_key"
- ]
- },
- {
- pop : "screen",
- @id : 2,
- child : 1
- } ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/e19c048c/contrib/format-maprdb/src/test/resources/hbase/hbase_scan_screen_physical_family_select.json
----------------------------------------------------------------------
diff --git a/contrib/format-maprdb/src/test/resources/hbase/hbase_scan_screen_physical_family_select.json b/contrib/format-maprdb/src/test/resources/hbase/hbase_scan_screen_physical_family_select.json
deleted file mode 100644
index 0002164..0000000
--- a/contrib/format-maprdb/src/test/resources/hbase/hbase_scan_screen_physical_family_select.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- head : {
- type : "APACHE_DRILL_PHYSICAL",
- version : 1,
- generator : {
- type : "manual"
- }
- },
- graph : [ {
- pop : "hbase-scan",
- @id : 1,
- hbaseScanSpec : {
- tableName : "[TABLE_NAME]"
- },
- storage:
- {
- "type":"hbase",
- config : {
- "hbase.zookeeper.quorum" : "localhost",
- "hbase.zookeeper.property.clientPort" : 2181
- }
- },
- columns: [
- "f2"
- ]
- },
- {
- pop : "screen",
- @id : 2,
- child : 1
- } ]
-}
\ No newline at end of file