drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cgi...@apache.org
Subject [drill] branch master updated: DRILL-7744: Move Filters from HTTP Storage Plugin to Drill Core
Date Wed, 27 May 2020 15:46:48 GMT
This is an automated email from the ASF dual-hosted git repository.

cgivre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git


The following commit(s) were added to refs/heads/master by this push:
     new 872fdd9  DRILL-7744: Move Filters from HTTP Storage Plugin to Drill Core
872fdd9 is described below

commit 872fdd9fba8ecc81eee469072a6140b93385afc3
Author: Charles Givre <cgivre@apache.org>
AuthorDate: Tue May 26 15:10:01 2020 -0400

    DRILL-7744: Move Filters from HTTP Storage Plugin to Drill Core
---
 .../exec/store/http/HttpPushDownListener.java      | 24 +++++++++++-----------
 .../drill/exec/store/http/HttpStoragePlugin.java   |  2 +-
 .../exec/store/base}/filter/ConstantHolder.java    |  2 +-
 .../drill/exec/store/base}/filter/ExprNode.java    |  2 +-
 .../store/base}/filter/FilterPushDownListener.java |  4 ++--
 .../store/base}/filter/FilterPushDownStrategy.java |  6 +++---
 .../store/base}/filter/FilterPushDownUtils.java    |  8 ++++----
 .../drill/exec/store/base}/filter/RelOp.java       |  2 +-
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpPushDownListener.java
b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpPushDownListener.java
index c7cd73a..49c1154 100644
--- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpPushDownListener.java
+++ b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpPushDownListener.java
@@ -17,12 +17,6 @@
  */
 package org.apache.drill.exec.store.http;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.apache.calcite.rex.RexNode;
 import org.apache.calcite.util.Pair;
 import org.apache.drill.common.map.CaseInsensitiveMap;
@@ -30,12 +24,18 @@ import org.apache.drill.common.types.TypeProtos.MinorType;
 import org.apache.drill.exec.ops.OptimizerRulesContext;
 import org.apache.drill.exec.physical.base.GroupScan;
 import org.apache.drill.exec.store.StoragePluginOptimizerRule;
-import org.apache.drill.exec.store.http.filter.ExprNode;
-import org.apache.drill.exec.store.http.filter.ExprNode.AndNode;
-import org.apache.drill.exec.store.http.filter.ExprNode.ColRelOpConstNode;
-import org.apache.drill.exec.store.http.filter.ExprNode.OrNode;
-import org.apache.drill.exec.store.http.filter.FilterPushDownListener;
-import org.apache.drill.exec.store.http.filter.FilterPushDownStrategy;
+import org.apache.drill.exec.store.base.filter.ExprNode;
+import org.apache.drill.exec.store.base.filter.ExprNode.AndNode;
+import org.apache.drill.exec.store.base.filter.ExprNode.ColRelOpConstNode;
+import org.apache.drill.exec.store.base.filter.ExprNode.OrNode;
+import org.apache.drill.exec.store.base.filter.FilterPushDownListener;
+import org.apache.drill.exec.store.base.filter.FilterPushDownStrategy;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * The HTTP storage plugin accepts filters which are:
diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpStoragePlugin.java
b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpStoragePlugin.java
index fde9623..e5bcc7b 100644
--- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpStoragePlugin.java
+++ b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpStoragePlugin.java
@@ -26,7 +26,7 @@ import org.apache.drill.exec.planner.PlannerPhase;
 import org.apache.drill.exec.server.DrillbitContext;
 import org.apache.drill.exec.store.AbstractStoragePlugin;
 import org.apache.drill.exec.store.SchemaConfig;
-import org.apache.drill.exec.store.http.filter.FilterPushDownUtils;
+import org.apache.drill.exec.store.base.filter.FilterPushDownUtils;
 import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet;
 
 import com.fasterxml.jackson.core.type.TypeReference;
diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/ConstantHolder.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/ConstantHolder.java
similarity index 99%
rename from contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/ConstantHolder.java
rename to exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/ConstantHolder.java
index 4350868..0d7bc01 100644
--- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/ConstantHolder.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/ConstantHolder.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.http.filter;
+package org.apache.drill.exec.store.base.filter;
 
 import java.math.BigDecimal;
 
diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/ExprNode.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/ExprNode.java
similarity index 99%
rename from contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/ExprNode.java
rename to exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/ExprNode.java
index e841077..5ccb35e 100644
--- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/ExprNode.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/ExprNode.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.http.filter;
+package org.apache.drill.exec.store.base.filter;
 
 import java.util.List;
 
diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/FilterPushDownListener.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownListener.java
similarity index 98%
rename from contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/FilterPushDownListener.java
rename to exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownListener.java
index d971a86..1c81fe6 100644
--- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/FilterPushDownListener.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownListener.java
@@ -15,14 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.http.filter;
+package org.apache.drill.exec.store.base.filter;
 
 import java.util.List;
 
 import org.apache.calcite.rex.RexNode;
 import org.apache.calcite.util.Pair;
 import org.apache.drill.exec.physical.base.GroupScan;
-import org.apache.drill.exec.store.http.filter.ExprNode.AndNode;
+import org.apache.drill.exec.store.base.filter.ExprNode.AndNode;
 
 /**
  * Call-back (listener) implementation for a push-down filter.
diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/FilterPushDownStrategy.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownStrategy.java
similarity index 98%
rename from contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/FilterPushDownStrategy.java
rename to exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownStrategy.java
index e652fc7..2a22b43 100644
--- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/FilterPushDownStrategy.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownStrategy.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.http.filter;
+package org.apache.drill.exec.store.base.filter;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -42,8 +42,8 @@ import org.apache.drill.exec.planner.logical.RelOptHelper;
 import org.apache.drill.exec.planner.physical.FilterPrel;
 import org.apache.drill.exec.planner.physical.PrelUtil;
 import org.apache.drill.exec.store.StoragePluginOptimizerRule;
-import org.apache.drill.exec.store.http.filter.ExprNode.AndNode;
-import org.apache.drill.exec.store.http.filter.FilterPushDownListener.ScanPushDownListener;
+import org.apache.drill.exec.store.base.filter.ExprNode.AndNode;
+import org.apache.drill.exec.store.base.filter.FilterPushDownListener.ScanPushDownListener;
 import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet;
 
 /**
diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/FilterPushDownUtils.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownUtils.java
similarity index 97%
rename from contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/FilterPushDownUtils.java
rename to exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownUtils.java
index 9005133..a627b62 100644
--- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/FilterPushDownUtils.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownUtils.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.http.filter;
+package org.apache.drill.exec.store.base.filter;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -41,9 +41,9 @@ import org.apache.drill.common.expression.ValueExpressions.VarDecimalExpression;
 import org.apache.drill.common.expression.visitors.AbstractExprVisitor;
 import org.apache.drill.common.types.TypeProtos.MinorType;
 import org.apache.drill.exec.planner.PlannerPhase;
-import org.apache.drill.exec.store.http.filter.ExprNode.AndNode;
-import org.apache.drill.exec.store.http.filter.ExprNode.ColRelOpConstNode;
-import org.apache.drill.exec.store.http.filter.ExprNode.OrNode;
+import org.apache.drill.exec.store.base.filter.ExprNode.AndNode;
+import org.apache.drill.exec.store.base.filter.ExprNode.ColRelOpConstNode;
+import org.apache.drill.exec.store.base.filter.ExprNode.OrNode;
 
 public class FilterPushDownUtils {
 
diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/RelOp.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/RelOp.java
similarity index 98%
rename from contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/RelOp.java
rename to exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/RelOp.java
index 9b59585..eff7e35 100644
--- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/filter/RelOp.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/RelOp.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.drill.exec.store.http.filter;
+package org.apache.drill.exec.store.base.filter;
 
 /**
  * Fixed set of Drill relational operators, using well-defined


Mime
View raw message