Fixing build issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/b8cef6b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/b8cef6b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/b8cef6b6 Branch: refs/heads/diagnostics2 Commit: b8cef6b6e0099bc146ddcccb492664b7238dd9b2 Parents: cb90852 Author: Aditya Kishore <[email protected]> Authored: Tue May 20 11:49:10 2014 -0700 Committer: Aditya Kishore <[email protected]> Committed: Tue May 20 11:49:10 2014 -0700 ---------------------------------------------------------------------- .../org/apache/drill/exec/ops/MetricDef.java | 17 +++++++++++++++++ .../org/apache/drill/exec/ops/OpProfileDef.java | 17 +++++++++++++++++ .../partitionsender/PartitionSenderStats.java | 17 +++++++++++++++++ .../drill/exec/server/rest/DrillRestServer.java | 18 +++++++++++++++++- .../apache/drill/exec/server/rest/DrillRoot.java | 19 ++++++++++++++++++- .../java/org/apache/drill/exec/util/Pointer.java | 17 +++++++++++++++++ .../drill/exec/work/foreman/FragmentData.java | 17 +++++++++++++++++ .../drill/exec/work/foreman/QueryStatus.java | 17 +++++++++++++++++ .../src/main/resources/rest/status/list.ftl | 11 +++++++++++ .../src/main/resources/rest/status/profile.ftl | 11 +++++++++++ .../drill/exec/server/DrillClientFactory.java | 17 +++++++++++++++++ .../apache/drill/exec/server/HelloResource.java | 17 +++++++++++++++++ .../org/apache/drill/exec/server/TestJersey.java | 17 +++++++++++++++++ .../drill/exec/server/rest/RootResource.java | 17 +++++++++++++++++ 14 files changed, 227 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b8cef6b6/exec/java-exec/src/main/java/org/apache/drill/exec/ops/MetricDef.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/MetricDef.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/MetricDef.java index e08a2b2..b3ece41 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/MetricDef.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/MetricDef.java @@ -1,3 +1,20 @@ +/** + * 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.ops; public interface MetricDef { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b8cef6b6/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OpProfileDef.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OpProfileDef.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OpProfileDef.java index 61f6d20..fb68e4a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OpProfileDef.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OpProfileDef.java @@ -1,3 +1,20 @@ +/** + * 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.ops; public class OpProfileDef { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b8cef6b6/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderStats.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderStats.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderStats.java index 99b9120..4790596 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderStats.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderStats.java @@ -1,3 +1,20 @@ +/** + * 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.physical.impl.partitionsender; import org.apache.drill.exec.ops.MetricDef; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b8cef6b6/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRestServer.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRestServer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRestServer.java index cfc3819..c0e0f19 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRestServer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRestServer.java @@ -1,7 +1,23 @@ +/** + * 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.rest; import org.apache.drill.exec.client.DrillClient; -import org.apache.drill.exec.server.HelloResource; import org.apache.drill.exec.work.WorkManager; import org.glassfish.hk2.utilities.binding.AbstractBinder; import org.glassfish.jersey.jackson.JacksonFeature; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b8cef6b6/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRoot.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRoot.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRoot.java index 27e0d17..996825d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRoot.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/DrillRoot.java @@ -1,3 +1,20 @@ +/** + * 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.rest; import java.util.List; @@ -16,7 +33,7 @@ import org.apache.drill.exec.proto.UserBitShared.QueryProfile; import org.apache.drill.exec.work.WorkManager; import org.glassfish.jersey.server.mvc.Viewable; -import com.google.hive12.hive12.common.collect.Lists; +import com.google.common.collect.Lists; @Path("/") public class DrillRoot { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b8cef6b6/exec/java-exec/src/main/java/org/apache/drill/exec/util/Pointer.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/Pointer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/Pointer.java index 8139943..074ed76 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/Pointer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/Pointer.java @@ -1,3 +1,20 @@ +/** + * 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.util; public class Pointer<T> { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b8cef6b6/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentData.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentData.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentData.java index 3bbe692..d9dd33e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentData.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentData.java @@ -1,3 +1,20 @@ +/** + * 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.work.foreman; import org.apache.drill.exec.proto.BitControl.FragmentStatus; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b8cef6b6/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryStatus.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryStatus.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryStatus.java index 991e9ac..8cc2cf1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryStatus.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/QueryStatus.java @@ -1,3 +1,20 @@ +/** + * 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.work.foreman; import org.apache.drill.exec.cache.DistributedCache; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b8cef6b6/exec/java-exec/src/main/resources/rest/status/list.ftl ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/resources/rest/status/list.ftl b/exec/java-exec/src/main/resources/rest/status/list.ftl index 6bde590..ab1ca30 100644 --- a/exec/java-exec/src/main/resources/rest/status/list.ftl +++ b/exec/java-exec/src/main/resources/rest/status/list.ftl @@ -1,3 +1,14 @@ +<#-- 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. --> + <html> Welcome to Drill! <br /> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b8cef6b6/exec/java-exec/src/main/resources/rest/status/profile.ftl ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/resources/rest/status/profile.ftl b/exec/java-exec/src/main/resources/rest/status/profile.ftl index 94ff6ef..4989ae9 100644 --- a/exec/java-exec/src/main/resources/rest/status/profile.ftl +++ b/exec/java-exec/src/main/resources/rest/status/profile.ftl @@ -1,3 +1,14 @@ +<#-- 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. --> + <html> <a href="/queries">back</a><br /> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b8cef6b6/exec/java-exec/src/test/java/org/apache/drill/exec/server/DrillClientFactory.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/DrillClientFactory.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/DrillClientFactory.java index 216cb3b..4230518 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/DrillClientFactory.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/DrillClientFactory.java @@ -1,3 +1,20 @@ +/** + * 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; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b8cef6b6/exec/java-exec/src/test/java/org/apache/drill/exec/server/HelloResource.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/HelloResource.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/HelloResource.java index cdb04ec..bfd4651 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/HelloResource.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/HelloResource.java @@ -1,3 +1,20 @@ +/** + * 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 javax.inject.Inject; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b8cef6b6/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 index 6e873ed..d47e559 100644 --- 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 @@ -1,3 +1,20 @@ +/** + * 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; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/b8cef6b6/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/RootResource.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/RootResource.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/RootResource.java index 42fc39e..59adad9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/RootResource.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/RootResource.java @@ -1,3 +1,20 @@ +/** + * 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.rest; import javax.ws.rs.Path;
