[1/2] drill git commit: DRILL-4199: Add Support for HBase 1.X
Repository: drill
Updated Branches:
refs/heads/master 6286c0a4b -> c2d9959e0
http://git-wip-us.apache.org/repos/asf/drill/blob/c2d9959e/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java
--
diff --git
a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java
b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java
index ce7d585..b054bfa 100644
---
a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java
+++
b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java
@@ -23,39 +23,36 @@ import java.util.List;
import org.apache.drill.exec.rpc.user.QueryDataBatch;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.HBaseAdmin;
-import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.client.Table;
import org.junit.Test;
public class TestHBaseQueries extends BaseHBaseTest {
@Test
public void testWithEmptyFirstAndLastRegion() throws Exception {
-HBaseAdmin admin = HBaseTestsSuite.getAdmin();
-String tableName = "drill_ut_empty_regions";
-HTable table = null;
+HBaseAdmin admin = (HBaseAdmin) HBaseTestsSuite.getAdmin();
+TableName tableName = TableName.valueOf("drill_ut_empty_regions");
-try {
-HTableDescriptor desc = new HTableDescriptor(tableName);
-desc.addFamily(new HColumnDescriptor("f"));
-admin.createTable(desc, Arrays.copyOfRange(TestTableGenerator.SPLIT_KEYS,
0, 2));
+try (Table table = HBaseTestsSuite.getConnection().getTable(tableName);) {
+ HTableDescriptor desc = new HTableDescriptor(tableName);
+ desc.addFamily(new HColumnDescriptor("f"));
+ admin.createTable(desc,
Arrays.copyOfRange(TestTableGenerator.SPLIT_KEYS, 0, 2));
-table = new HTable(admin.getConfiguration(), tableName);
-Put p = new Put("b".getBytes());
-p.add("f".getBytes(), "c".getBytes(), "1".getBytes());
-table.put(p);
+ Put p = new Put("b".getBytes());
+ p.addColumn("f".getBytes(), "c".getBytes(), "1".getBytes());
+ table.put(p);
-setColumnWidths(new int[] {8, 15});
-runHBaseSQLVerifyCount("SELECT *\n"
-+ "FROM\n"
-+ " hbase.`" + tableName + "` tableName\n"
-, 1);
+ setColumnWidths(new int[] {8, 15});
+ runHBaseSQLVerifyCount("SELECT *\n"
+ + "FROM\n"
+ + " hbase.`" + tableName + "` tableName\n"
+ , 1);
} finally {
try {
-if (table != null) {
- table.close();
-}
admin.disableTable(tableName);
admin.deleteTable(tableName);
} catch (Exception e) { } // ignore
@@ -63,20 +60,16 @@ public class TestHBaseQueries extends BaseHBaseTest {
}
-
@Test
public void testWithEmptyTable() throws Exception {
-HBaseAdmin admin = HBaseTestsSuite.getAdmin();
-String tableName = "drill_ut_empty_table";
-HTable table = null;
+Admin admin = HBaseTestsSuite.getAdmin();
+TableName tableName = TableName.valueOf("drill_ut_empty_table");
-try {
+try (Table table = HBaseTestsSuite.getConnection().getTable(tableName);) {
HTableDescriptor desc = new HTableDescriptor(tableName);
desc.addFamily(new HColumnDescriptor("f"));
admin.createTable(desc,
Arrays.copyOfRange(TestTableGenerator.SPLIT_KEYS, 0, 2));
- table = new HTable(admin.getConfiguration(), tableName);
-
setColumnWidths(new int[] {8, 15});
runHBaseSQLVerifyCount("SELECT row_key, count(*)\n"
+ "FROM\n"
@@ -84,14 +77,12 @@ public class TestHBaseQueries extends BaseHBaseTest {
, 0);
} finally {
try {
-if (table != null) {
- table.close();
-}
admin.disableTable(tableName);
admin.deleteTable(tableName);
} catch (Exception e) { } // ignore
}
}
+
@Test
public void testCastEmptyStrings() throws Exception {
try {
@@ -106,4 +97,5 @@ public class TestHBaseQueries extends BaseHBaseTest {
test("alter system reset
`drill.exec.functions.cast_empty_string_to_null`;");
}
}
+
}
http://git-wip-us.apache.org/repos/asf/drill/blob/c2d9959e/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java
--
diff --git
a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java
b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java
index 96c3668..391a616 100644
---
a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java
+++
b/
[2/2] drill git commit: DRILL-4199: Add Support for HBase 1.X
DRILL-4199: Add Support for HBase 1.X Highlights of the changes: * Replaced the old HBase APIs (HBaseAdmin/HTable) with the new HBase 1.1 APIs (Connection/Admin/Table). * Added HBaseConnectionManager class which which manages the life-cycle of HBase connections inside a Drillbit process. * Updated HBase dependencies version to 1.1.3 and 1.1.1-mapr-1602-m7-5.1.0 for default and "mapr" profiles respectively. * Added `commons-logging` dependency in the `provided` scope to allow HBase test cluster to come up for Unit tests. * Relaxed banned dependency rule for `commons-logging` library for `storage-hbase` module alone, in provided scope only. * Removed the use of many deprecated APIs throughout the modules code. * Added some missing test to HBase storage plugin's test suit. * Move the GuavaPatcher code to main code execution path. * Log a message if GuavaPatcher fails instead of exiting. All unit tests are green. Closes #443 Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/c2d9959e Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/c2d9959e Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/c2d9959e Branch: refs/heads/master Commit: c2d9959e07f47a09a4a11c250f84f4874b7e1db4 Parents: 6286c0a Author: Aditya Kishore Authored: Sun Jun 12 16:28:52 2016 -0700 Committer: Aditya Kishore Committed: Tue Jun 14 13:37:20 2016 -0700 -- contrib/storage-hbase/pom.xml | 30 ++ .../conv/OrderedBytesBigIntConvertFrom.java | 2 +- .../impl/conv/OrderedBytesBigIntConvertTo.java | 2 +- .../conv/OrderedBytesBigIntDescConvertTo.java | 2 +- .../conv/OrderedBytesDoubleConvertFrom.java | 2 +- .../impl/conv/OrderedBytesDoubleConvertTo.java | 2 +- .../conv/OrderedBytesDoubleDescConvertTo.java | 2 +- .../impl/conv/OrderedBytesFloatConvertFrom.java | 2 +- .../impl/conv/OrderedBytesFloatConvertTo.java | 2 +- .../conv/OrderedBytesFloatDescConvertTo.java| 2 +- .../impl/conv/OrderedBytesIntConvertFrom.java | 2 +- .../fn/impl/conv/OrderedBytesIntConvertTo.java | 2 +- .../impl/conv/OrderedBytesIntDescConvertTo.java | 2 +- .../store/hbase/CompareFunctionsProcessor.java | 10 +- .../drill/exec/store/hbase/DrillHBaseTable.java | 17 +- .../store/hbase/HBaseConnectionManager.java | 109 ++ .../exec/store/hbase/HBaseFilterBuilder.java| 10 +- .../drill/exec/store/hbase/HBaseGroupScan.java | 29 +- .../store/hbase/HBasePushFilterIntoScan.java| 9 +- .../exec/store/hbase/HBaseRecordReader.java | 26 +- .../exec/store/hbase/HBaseScanBatchCreator.java | 2 +- .../exec/store/hbase/HBaseSchemaFactory.java| 8 +- .../exec/store/hbase/HBaseStoragePlugin.java| 93 - .../drill/exec/store/hbase/HBaseSubScan.java| 4 +- .../exec/store/hbase/TableStatsCalculator.java | 32 +- .../hbase/config/HBasePersistentStore.java | 59 +-- .../config/HBasePersistentStoreProvider.java| 46 +-- .../org/apache/drill/hbase/BaseHBaseTest.java | 15 +- .../org/apache/drill/hbase/GuavaPatcher.java| 90 - .../drill/hbase/HBaseRecordReaderTest.java | 6 +- .../org/apache/drill/hbase/HBaseTestsSuite.java | 92 +++-- .../drill/hbase/TestHBaseConnectionManager.java | 58 +++ .../drill/hbase/TestHBaseFilterPushDown.java| 1 - .../apache/drill/hbase/TestHBaseQueries.java| 52 ++- .../hbase/TestOrderedBytesConvertFunctions.java | 22 -- .../apache/drill/hbase/TestTableGenerator.java | 372 +-- ...30StorageHBaseHamcrestConfigurationTest.java | 8 +- .../src/test/resources/logback.xml | 10 +- .../org/apache/drill/exec/server/Drillbit.java | 7 + .../apache/drill/exec/util/GuavaPatcher.java| 89 + pom.xml | 10 +- 41 files changed, 806 insertions(+), 534 deletions(-) -- http://git-wip-us.apache.org/repos/asf/drill/blob/c2d9959e/contrib/storage-hbase/pom.xml -- diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml index fecb5ba..be38dd8 100644 --- a/contrib/storage-hbase/pom.xml +++ b/contrib/storage-hbase/pom.xml @@ -77,6 +77,14 @@ 2.1.1 test + + commons-logging + + commons-logging + 1.2 + provided + @@ -130,6 +138,28 @@ + +maven-enforcer-plugin + + +avoid_bad_dependencies +verify + + enforce + + + + + + + commons-logging:commons-logging:*:jar:provided + + + + + +
drill-site git commit: update drill hangout info
Repository: drill-site Updated Branches: refs/heads/asf-site 1c17b85f2 -> 14b4bdb7e update drill hangout info Project: http://git-wip-us.apache.org/repos/asf/drill-site/repo Commit: http://git-wip-us.apache.org/repos/asf/drill-site/commit/14b4bdb7 Tree: http://git-wip-us.apache.org/repos/asf/drill-site/tree/14b4bdb7 Diff: http://git-wip-us.apache.org/repos/asf/drill-site/diff/14b4bdb7 Branch: refs/heads/asf-site Commit: 14b4bdb7e61ea105db362975b94e92cc112cb887 Parents: 1c17b85 Author: Bridget Bevens Authored: Tue Jun 14 11:35:45 2016 -0700 Committer: Bridget Bevens Committed: Tue Jun 14 11:35:45 2016 -0700 -- community-resources/index.html | 2 +- feed.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/drill-site/blob/14b4bdb7/community-resources/index.html -- diff --git a/community-resources/index.html b/community-resources/index.html index 09e5985..fb1fb3d 100644 --- a/community-resources/index.html +++ b/community-resources/index.html @@ -134,7 +134,7 @@ Issue tracker: https://issues.apache.org/jira/browse/DRILL/";>JIRA Contribute to Drill -Hangout: https://plus.google.com/hangouts/_/event/ci4rdiju8bv04a64efj5fedd0lc";>Monthly Drill Hangout (first Tuesday of every month at 10am PDT) +Hangout: A https://plus.google.com/hangouts/_/event/ci4rdiju8bv04a64efj5fedd0lc";>bi-weekly Drill hangout occurs every other Tuesday at 10 am PDT. For more information and hangout notes, see https://docs.google.com/document/d/1o2GvZUtJvKzN013JdM715ZBzhseT0VyZ9WgmLMeeUUk/edit?ts=5744c15c#heading=h.z8q6drmaybbj";>Apache Drill Hangout Notes. Source code: https://github.com/apache/drill";>GitHub http://git-wip-us.apache.org/repos/asf/drill-site/blob/14b4bdb7/feed.xml -- diff --git a/feed.xml b/feed.xml index aecbace..5aa52e4 100644 --- a/feed.xml +++ b/feed.xml @@ -6,8 +6,8 @@ / -Fri, 03 Jun 2016 15:19:47 -0700 -Fri, 03 Jun 2016 15:19:47 -0700 +Tue, 14 Jun 2016 11:33:17 -0700 +Tue, 14 Jun 2016 11:33:17 -0700 Jekyll v2.5.2
drill git commit: update drill hangout info
Repository: drill
Updated Branches:
refs/heads/gh-pages ea1aa1fa7 -> 85659b348
update drill hangout info
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/85659b34
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/85659b34
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/85659b34
Branch: refs/heads/gh-pages
Commit: 85659b3483a5e0d46bb0683a4b2294cbb03736f4
Parents: ea1aa1f
Author: Bridget Bevens
Authored: Tue Jun 14 11:29:43 2016 -0700
Committer: Bridget Bevens
Committed: Tue Jun 14 11:29:43 2016 -0700
--
community-resources.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/drill/blob/85659b34/community-resources.md
--
diff --git a/community-resources.md b/community-resources.md
index ce9c9d6..836b23c 100755
--- a/community-resources.md
+++ b/community-resources.md
@@ -17,5 +17,5 @@ title: Community Resources
* Issue tracker: [JIRA](https://issues.apache.org/jira/browse/DRILL/)
* [Contribute to Drill]({{ site.baseurl }}/docs/contribute-to-drill/)
-* Hangout: [Monthly Drill
Hangout](https://plus.google.com/hangouts/_/event/ci4rdiju8bv04a64efj5fedd0lc)
(first Tuesday of every month at 10am PDT)
+* Hangout: A [bi-weekly Drill
hangout](https://plus.google.com/hangouts/_/event/ci4rdiju8bv04a64efj5fedd0lc)
occurs every other Tuesday at 10 am PDT. For more information and hangout
notes, see [Apache Drill Hangout
Notes](https://docs.google.com/document/d/1o2GvZUtJvKzN013JdM715ZBzhseT0VyZ9WgmLMeeUUk/edit?ts=5744c15c#heading=h.z8q6drmaybbj).
* Source code: [GitHub](https://github.com/apache/drill)
