drill-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jacq...@apache.org
Subject [22/24] git commit: Disable SV2 for Project until wildcard is fixed. Remove spurious test.
Date Thu, 22 May 2014 01:14:59 GMT
Disable SV2 for Project until wildcard is fixed.  Remove spurious test.


Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/3eb4f751
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/3eb4f751
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/3eb4f751

Branch: refs/heads/diagnostics2
Commit: 3eb4f7514eaf85125b2b01368009cd7150e7f728
Parents: 864ebde
Author: Jacques Nadeau <jacques@apache.org>
Authored: Wed May 21 17:06:03 2014 -0700
Committer: Jacques Nadeau <jacques@apache.org>
Committed: Wed May 21 17:06:03 2014 -0700

----------------------------------------------------------------------
 .../exec/planner/physical/ProjectPrel.java      |  2 +-
 .../apache/drill/exec/server/TestJersey.java    | 65 --------------------
 2 files changed, 1 insertion(+), 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3eb4f751/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrel.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrel.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrel.java
index 55f9f32..88cbb50 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrel.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrel.java
@@ -75,7 +75,7 @@ public class ProjectPrel extends DrillProjectRelBase implements Prel{
 
   @Override
   public SelectionVectorMode[] getSupportedEncodings() {
-    return SelectionVectorMode.NONE_AND_TWO;
+    return SelectionVectorMode.DEFAULT;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3eb4f751/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestJersey.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestJersey.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestJersey.java
deleted file mode 100644
index d47e559..0000000
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestJersey.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * 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.
- */
-package org.apache.drill.exec.server;
-
-import org.apache.drill.exec.client.DrillClient;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.glassfish.hk2.utilities.binding.AbstractBinder;
-import org.glassfish.jersey.jackson.JacksonFeature;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.server.ServerProperties;
-import org.glassfish.jersey.servlet.ServletContainer;
-import org.junit.Test;
-
-public class TestJersey {
-  static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestJersey.class);
-
-  @Test
-  public void x() throws Exception {
-    Server server = new Server(8112);
-    ServletContextHandler context = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
-    context.setContextPath("/");
-    server.setHandler(context);
-    ServletHolder h = new ServletHolder(new ServletContainer(new MyApplication()));
-    h.setInitParameter(ServerProperties.PROVIDER_PACKAGES, "org.apache.drill.exec.server");
-    h.setInitOrder(1);
-    context.addServlet(h, "/*");
-    server.start();
-    server.join();
-
-  }
-
-  public class MyApplication extends ResourceConfig {
-
-    public MyApplication() {
-        registerClasses(HelloResource.class);
-        register(JacksonFeature.class);
-        property(ServerProperties.METAINF_SERVICES_LOOKUP_DISABLE, true);
-        register(new AbstractBinder() {
-            @Override
-            protected void configure() {
-              this.bind(new DrillClient()).to(DrillClient.class);
-            }
-        });
-    }
-}
-
-
-}


Mime
View raw message