You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/08/16 03:22:02 UTC
svn commit: r1514554 [2/18] - in /hive/branches/vectorization: ./
beeline/src/java/org/apache/hive/beeline/
cli/src/java/org/apache/hadoop/hive/cli/
cli/src/test/org/apache/hadoop/hive/cli/
common/src/java/org/apache/hadoop/hive/conf/ conf/ contrib/src...
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/DatabaseConnections.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/DatabaseConnections.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/DatabaseConnections.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/DatabaseConnections.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/DriverInfo.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/DriverInfo.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/DriverInfo.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/DriverInfo.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/IncrementalRows.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/IncrementalRows.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/IncrementalRows.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/IncrementalRows.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/OutputFile.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/OutputFile.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/OutputFile.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/OutputFile.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/OutputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/OutputFormat.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/OutputFormat.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/OutputFormat.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/ReflectiveCommandHandler.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/ReflectiveCommandHandler.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/ReflectiveCommandHandler.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/ReflectiveCommandHandler.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/Reflector.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/Reflector.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/Reflector.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/Reflector.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/Rows.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/Rows.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/Rows.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/Rows.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/SQLCompletor.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/SQLCompletor.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/SQLCompletor.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/SQLCompletor.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/SeparatedValuesOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/SeparatedValuesOutputFormat.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/SeparatedValuesOutputFormat.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/SeparatedValuesOutputFormat.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
- *
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+/**
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/SunSignalHandler.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/SunSignalHandler.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/SunSignalHandler.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/SunSignalHandler.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/TableNameCompletor.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/TableNameCompletor.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/TableNameCompletor.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/TableNameCompletor.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/TableOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/TableOutputFormat.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/TableOutputFormat.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/TableOutputFormat.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/VerticalOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/VerticalOutputFormat.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/VerticalOutputFormat.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/VerticalOutputFormat.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/XMLAttributeOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/XMLAttributeOutputFormat.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/XMLAttributeOutputFormat.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/XMLAttributeOutputFormat.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/XMLElementOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/XMLElementOutputFormat.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/XMLElementOutputFormat.java (original)
+++ hive/branches/vectorization/beeline/src/java/org/apache/hive/beeline/XMLElementOutputFormat.java Fri Aug 16 01:21:54 2013
@@ -1,46 +1,24 @@
-/*
- * Copyright (c) 2002,2003,2004,2005 Marc Prud'hommeaux
- * All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms,
- * with or without modification, are permitted provided
- * that the following conditions are met:
+/**
+ * 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
*
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names
- * of its contributors may be used to endorse or promote
- * products derived from this software without specific
- * prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This software is hosted by SourceForge.
- * SourceForge is a trademark of VA Linux Systems, Inc.
+ * 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.
*/
/*
* This source file is based on code taken from SQLLine 1.0.2
- * The license above originally appeared in src/sqlline/SqlLine.java
- * http://sqlline.sourceforge.net/
+ * See SQLLine notice in LICENSE
*/
package org.apache.hive.beeline;
Modified: hive/branches/vectorization/build-common.xml
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/build-common.xml?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/build-common.xml (original)
+++ hive/branches/vectorization/build-common.xml Fri Aug 16 01:21:54 2013
@@ -59,7 +59,7 @@
<property name="test.output" value="true"/>
<property name="test.junit.output.format" value="xml"/>
<property name="test.junit.output.usefile" value="true"/>
- <property name="minimr.query.files" value="list_bucket_dml_10.q,input16_cc.q,scriptfile1.q,bucket4.q,bucketmapjoin6.q,disable_merge_for_bucketing.q,reduce_deduplicate.q,smb_mapjoin_8.q,join1.q,groupby2.q,bucketizedhiveinputformat.q,bucketmapjoin7.q,optrstat_groupby.q,bucket_num_reducers.q,bucket5.q,load_fs2.q,bucket_num_reducers2.q,infer_bucket_sort_merge.q,infer_bucket_sort_reducers_power_two.q,infer_bucket_sort_dyn_part.q,infer_bucket_sort_bucketed_table.q,infer_bucket_sort_map_operators.q,infer_bucket_sort_num_buckets.q,leftsemijoin_mr.q,schemeAuthority.q,truncate_column_buckets.q,remote_script.q,,load_hdfs_file_with_space_in_the_name.q,parallel_orderby.q"/>
+ <property name="minimr.query.files" value="list_bucket_dml_10.q,input16_cc.q,scriptfile1.q,bucket4.q,bucketmapjoin6.q,disable_merge_for_bucketing.q,reduce_deduplicate.q,smb_mapjoin_8.q,join1.q,groupby2.q,bucketizedhiveinputformat.q,bucketmapjoin7.q,optrstat_groupby.q,bucket_num_reducers.q,bucket5.q,load_fs2.q,bucket_num_reducers2.q,infer_bucket_sort_merge.q,infer_bucket_sort_reducers_power_two.q,infer_bucket_sort_dyn_part.q,infer_bucket_sort_bucketed_table.q,infer_bucket_sort_map_operators.q,infer_bucket_sort_num_buckets.q,leftsemijoin_mr.q,schemeAuthority.q,schemeAuthority2.q,truncate_column_buckets.q,remote_script.q,,load_hdfs_file_with_space_in_the_name.q,parallel_orderby.q"/>
<property name="minimr.query.negative.files" value="cluster_tasklog_retrieval.q,minimr_broken_pipe.q,mapreduce_stack_trace.q,mapreduce_stack_trace_turnoff.q,mapreduce_stack_trace_hadoop20.q,mapreduce_stack_trace_turnoff_hadoop20.q" />
<property name="test.silent" value="true"/>
<property name="hadoopVersion" value="${hadoop.version.ant-internal}"/>
Modified: hive/branches/vectorization/build.properties
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/build.properties?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/build.properties (original)
+++ hive/branches/vectorization/build.properties Fri Aug 16 01:21:54 2013
@@ -131,7 +131,7 @@ build.ivy.lib.dir=${build.ivy.dir}/lib
build.ivy.report.dir=${build.ivy.dir}/report
build.ivy.maven.dir=${build.ivy.dir}/maven
ivy.conf.dir=${hive.root}/ivy
-ivy.version=2.1.0
+ivy.version=2.3.0
ivy.jar=${build.ivy.lib.dir}/ivy-${ivy.version}.jar
ivy.changingPattern=.*SNAPSHOT
ivy.publish.pattern=[artifact]-[revision].[ext]
Modified: hive/branches/vectorization/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/build.xml?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/build.xml (original)
+++ hive/branches/vectorization/build.xml Fri Aug 16 01:21:54 2013
@@ -700,7 +700,7 @@
<antcall target="docs-anakia"/>
</target>
- <target name="javadoc" depends="package" description="Generate Javadoc">
+ <target name="javadoc" depends="package" description="Generate Javadoc" unless="skip.javadoc">
<echo message="Project: ${ant.project.name}"/>
<mkdir dir="${build.javadoc}"/>
<javadoc
@@ -713,6 +713,7 @@
windowtitle="${Name} ${version} API"
doctitle="${Name} ${version} API"
bottom="Copyright &copy; ${year} The Apache Software Foundation"
+ useexternalfile="yes"
>
<packageset dir="ant/src"/>
Modified: hive/branches/vectorization/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java (original)
+++ hive/branches/vectorization/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java Fri Aug 16 01:21:54 2013
@@ -611,11 +611,11 @@ public class CliDriver {
}
public static void main(String[] args) throws Exception {
- int ret = run(args);
+ int ret = new CliDriver().run(args);
System.exit(ret);
}
- public static int run(String[] args) throws Exception {
+ public int run(String[] args) throws Exception {
OptionsProcessor oproc = new OptionsProcessor();
if (!oproc.process_stage1(args)) {
@@ -690,7 +690,7 @@ public class CliDriver {
* @return status of the CLI comman execution
* @throws Exception
*/
- private static int executeDriver(CliSessionState ss, HiveConf conf, OptionsProcessor oproc)
+ private int executeDriver(CliSessionState ss, HiveConf conf, OptionsProcessor oproc)
throws Exception {
// connect to Hive Server
@@ -734,15 +734,14 @@ public class CliDriver {
try {
if (ss.fileName != null) {
- int fileProcessStatus = cli.processFile(ss.fileName);
- return fileProcessStatus;
+ return cli.processFile(ss.fileName);
}
} catch (FileNotFoundException e) {
System.err.println("Could not open input file for reading. (" + e.getMessage() + ")");
return 3;
}
- ConsoleReader reader = new ConsoleReader();
+ ConsoleReader reader = getConsoleReader();
reader.setBellEnabled(false);
// reader.setDebug(new PrintWriter(new FileWriter("writer.debug", true)));
for (Completor completor : getCommandCompletor()) {
@@ -793,6 +792,9 @@ public class CliDriver {
return ret;
}
+ protected ConsoleReader getConsoleReader() throws IOException{
+ return new ConsoleReader();
+ }
/**
* Retrieve the current database name string to display, based on the
* configuration value.
Modified: hive/branches/vectorization/cli/src/java/org/apache/hadoop/hive/cli/RCFileCat.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/cli/src/java/org/apache/hadoop/hive/cli/RCFileCat.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/cli/src/java/org/apache/hadoop/hive/cli/RCFileCat.java (original)
+++ hive/branches/vectorization/cli/src/java/org/apache/hadoop/hive/cli/RCFileCat.java Fri Aug 16 01:21:54 2013
@@ -22,6 +22,7 @@ import java.io.BufferedOutputStream;
import java.io.FileDescriptor;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStream;
import java.io.PrintStream;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
@@ -53,6 +54,8 @@ public class RCFileCat implements Tool{
// In verbose mode, print an update per RECORD_PRINT_INTERVAL records
private static final int RECORD_PRINT_INTERVAL = (1024*1024);
+ protected static boolean test=false;
+
public RCFileCat() {
super();
decoder = Charset.forName("UTF-8").newDecoder().
@@ -81,6 +84,7 @@ public class RCFileCat implements Tool{
//get options from arguments
if (args.length < 1 || args.length > 3) {
printUsage(null);
+ return -1;
}
Path fileName = null;
for (int i = 0; i < args.length; i++) {
@@ -102,6 +106,7 @@ public class RCFileCat implements Tool{
fileName = new Path(arg);
} else {
printUsage(null);
+ return -1;
}
}
@@ -253,14 +258,19 @@ public class RCFileCat implements Tool{
e.printStackTrace();
System.err.println("\n\n\n");
printUsage(e.getMessage());
+ System.exit(1);
}
}
private static void setupBufferedOutput() {
- FileOutputStream fdout =
- new FileOutputStream(FileDescriptor.out);
+ OutputStream pdataOut;
+ if (test) {
+ pdataOut = System.out;
+ } else {
+ pdataOut = new FileOutputStream(FileDescriptor.out);
+ }
BufferedOutputStream bos =
- new BufferedOutputStream(fdout, STDOUT_BUFFER_SIZE);
+ new BufferedOutputStream(pdataOut, STDOUT_BUFFER_SIZE);
PrintStream ps =
new PrintStream(bos, false);
System.setOut(ps);
@@ -270,7 +280,6 @@ public class RCFileCat implements Tool{
if(errorMsg != null) {
System.err.println(errorMsg);
}
- System.exit(1);
}
}
Modified: hive/branches/vectorization/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java (original)
+++ hive/branches/vectorization/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java Fri Aug 16 01:21:54 2013
@@ -17,28 +17,50 @@
*/
package org.apache.hadoop.hive.cli;
-import junit.framework.TestCase;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.metastore.api.FieldSchema;
-import org.apache.hadoop.hive.metastore.api.Schema;
-import org.apache.hadoop.hive.ql.CommandNeedRetryException;
-import org.apache.hadoop.hive.ql.Driver;
-import org.apache.hadoop.hive.ql.processors.CommandProcessorResponse;
-
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
-import static org.apache.hadoop.hive.conf.HiveConf.ConfVars;
import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.lang.reflect.Field;
+import java.security.Permission;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import jline.ArgumentCompletor;
+import jline.Completor;
+import jline.ConsoleReader;
+import junit.framework.TestCase;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
+import org.apache.hadoop.hive.metastore.api.FieldSchema;
+import org.apache.hadoop.hive.metastore.api.Schema;
+import org.apache.hadoop.hive.ql.CommandNeedRetryException;
+import org.apache.hadoop.hive.ql.Driver;
+import org.apache.hadoop.hive.ql.processors.CommandProcessorResponse;
+import org.apache.hadoop.hive.service.HiveClient;
+import org.apache.hadoop.hive.service.HiveServerException;
+import org.apache.thrift.TException;
+
+
// Cannot call class TestCliDriver since that's the name of the generated
// code for the script-based testing
public class TestCliDriverMethods extends TestCase {
@@ -58,7 +80,8 @@ public class TestCliDriverMethods extend
}
// If the command has no schema, make sure nothing is printed
- public void testThatCliDriverPrintsNoHeaderForCommandsWithNoSchema() throws CommandNeedRetryException {
+ public void testThatCliDriverPrintsNoHeaderForCommandsWithNoSchema()
+ throws CommandNeedRetryException {
Schema mockSchema = mock(Schema.class);
when(mockSchema.getFieldSchemas()).thenReturn(null);
@@ -69,16 +92,21 @@ public class TestCliDriverMethods extend
/**
* Do the actual testing against a mocked CliDriver based on what type of schema
- * @param mockSchema Schema to throw against test
+ *
+ * @param mockSchema
+ * Schema to throw against test
* @return Output that would have been sent to the user
- * @throws CommandNeedRetryException won't actually be thrown
+ * @throws CommandNeedRetryException
+ * won't actually be thrown
*/
private PrintStream headerPrintingTestDriver(Schema mockSchema) throws CommandNeedRetryException {
CliDriver cliDriver = new CliDriver();
// We want the driver to try to print the header...
+
Configuration conf = mock(Configuration.class);
- when(conf.getBoolean(eq(ConfVars.HIVE_CLI_PRINT_HEADER.varname), anyBoolean())).thenReturn(true);
+ when(conf.getBoolean(eq(ConfVars.HIVE_CLI_PRINT_HEADER.varname), anyBoolean()))
+ .thenReturn(true);
cliDriver.setConf(conf);
Driver proc = mock(Driver.class);
@@ -99,4 +127,429 @@ public class TestCliDriverMethods extend
return mockOut;
}
+
+ public void testGetCommandCompletor() {
+ Completor[] completors = CliDriver.getCommandCompletor();
+ assertEquals(2, completors.length);
+ assertTrue(completors[0] instanceof ArgumentCompletor);
+ assertTrue(completors[1] instanceof Completor);
+
+ //comletor add space after last delimeter
+ List<String>testList=new ArrayList<String>(Arrays.asList(new String[]{")"}));
+ completors[1].complete("fdsdfsdf", 0, testList);
+ assertEquals(") ", testList.get(0));
+ testList=new ArrayList<String>();
+ completors[1].complete("len", 0, testList);
+ assertTrue(testList.get(0).endsWith("length("));
+
+ testList=new ArrayList<String>();
+ completors[0].complete("set f", 0, testList);
+ assertEquals("set", testList.get(0));
+
+ }
+
+ public void testRun() throws Exception {
+ // clean history
+ String historyDirectory = System.getProperty("user.home");
+ if ((new File(historyDirectory)).exists()) {
+ File historyFile = new File(historyDirectory + File.separator + ".hivehistory");
+ historyFile.delete();
+ }
+ HiveConf configuration = new HiveConf();
+ CliSessionState ss = new CliSessionState(configuration);
+ CliSessionState.start(ss);
+ String[] args = {};
+ PrintStream oldOut = System.out;
+ ByteArrayOutputStream dataOut = new ByteArrayOutputStream();
+ System.setOut(new PrintStream(dataOut));
+
+ PrintStream oldErr = System.err;
+ ByteArrayOutputStream dataErr = new ByteArrayOutputStream();
+ System.setErr(new PrintStream(dataErr));
+
+
+ try {
+ new FakeCliDriver().run(args);
+ assertTrue(dataOut.toString().contains("test message"));
+ assertTrue(dataErr.toString().contains("Hive history file="));
+ assertTrue(dataErr.toString().contains("File: fakeFile is not a file."));
+ dataOut.reset();
+ dataErr.reset();
+
+ } finally {
+ System.setOut(oldOut);
+ System.setErr(oldErr);
+
+ }
+
+ }
+
+ /**
+ * Test commands exit and quit
+ */
+ public void testQuit() throws Exception {
+
+ CliSessionState ss = new CliSessionState(new HiveConf());
+ ss.err = System.err;
+ ss.out = System.out;
+
+ NoExitSecurityManager newSecurityManager = new NoExitSecurityManager();
+ try {
+ CliSessionState.start(ss);
+ CliDriver cliDriver = new CliDriver();
+ cliDriver.processCmd("quit");
+ fail("should be exit");
+ } catch (ExitException e) {
+ assertEquals(0, e.getStatus());
+
+ } catch (Exception e) {
+ newSecurityManager.resetSecurityManager();
+ throw e;
+ }
+
+ try {
+ CliSessionState.start(ss);
+ CliDriver cliDriver = new CliDriver();
+ cliDriver.processCmd("exit");
+ fail("should be exit");
+ } catch (ExitException e) {
+ assertEquals(0, e.getStatus());
+
+ } finally {
+ newSecurityManager.resetSecurityManager();
+ }
+
+ }
+
+ /**
+ * test remote execCommand
+ */
+ public void testRemoteCall() throws Exception {
+ MyCliSessionState ss = new MyCliSessionState(new HiveConf(),
+ org.apache.hadoop.hive.cli.TestCliDriverMethods.MyCliSessionState.ClientResult.RETURN_OK);
+ ss.err = System.err;
+ ByteArrayOutputStream data = new ByteArrayOutputStream();
+ ss.out = new PrintStream(data);
+ MyCliSessionState.start(ss);
+
+ CliDriver cliDriver = new CliDriver();
+ cliDriver.processCmd("remote command");
+ assertTrue(data.toString().contains("test result"));
+
+ }
+
+ /**
+ * test remote Exception
+ */
+ public void testServerException() throws Exception {
+ MyCliSessionState ss = new MyCliSessionState(
+ new HiveConf(),
+ org.apache.hadoop.hive.cli.TestCliDriverMethods.MyCliSessionState.ClientResult.RETURN_SERVER_EXCEPTION);
+ ByteArrayOutputStream data = new ByteArrayOutputStream();
+ ss.err = new PrintStream(data);
+ ss.out = System.out;
+ MyCliSessionState.start(ss);
+
+ CliDriver cliDriver = new CliDriver();
+ cliDriver.processCmd("remote command");
+ assertTrue(data.toString().contains("[Hive Error]: test HiveServerException"));
+ data.reset();
+
+
+ }
+
+ /**
+ * test remote Exception
+ */
+ public void testServerTException() throws Exception {
+ MyCliSessionState ss = new MyCliSessionState(
+ new HiveConf(),
+ org.apache.hadoop.hive.cli.TestCliDriverMethods.MyCliSessionState.ClientResult.RETURN_T_EXCEPTION);
+ ByteArrayOutputStream data = new ByteArrayOutputStream();
+ ss.err = new PrintStream(data);
+ ss.out = System.out;
+ MyCliSessionState.start(ss);
+
+ CliDriver cliDriver = new CliDriver();
+ cliDriver.processCmd("remote command");
+ assertTrue(data.toString().contains("[Thrift Error]: test TException"));
+ assertTrue(data.toString().contains(
+ "[Thrift Error]: Hive server is not cleaned due to thrift exception: test TException"));
+
+ }
+
+ /**
+ * test remote Exception
+ */
+ public void testProcessSelectDatabase() throws Exception {
+ CliSessionState sessinState = new CliSessionState(new HiveConf());
+ CliSessionState.start(sessinState);
+ ByteArrayOutputStream data = new ByteArrayOutputStream();
+ sessinState.err = new PrintStream(data);
+ sessinState.database = "database";
+ CliDriver driver = new CliDriver();
+ NoExitSecurityManager securityManager = new NoExitSecurityManager();
+ try {
+ driver.processSelectDatabase(sessinState);
+ fail("shuld be exit");
+ } catch (ExitException e) {
+ e.printStackTrace();
+ assertEquals(40000, e.getStatus());
+ } finally {
+ securityManager.resetSecurityManager();
+ }
+ assertTrue(data.toString().contains(
+ "FAILED: ParseException line 1:4 cannot recognize input near 'database'"));
+ }
+
+ public void testprocessInitFiles() throws Exception {
+ String oldHiveHome = System.getenv("HIVE_HOME");
+ String oldHiveConfDir = System.getenv("HIVE_CONF_DIR");
+
+ File homeFile = File.createTempFile("test", "hive");
+ String tmpDir = homeFile.getParentFile().getAbsoluteFile() + File.separator
+ + "TestCliDriverMethods";
+ homeFile.delete();
+ FileUtils.deleteDirectory(new File(tmpDir));
+ homeFile = new File(tmpDir + File.separator + "bin" + File.separator + CliDriver.HIVERCFILE);
+ homeFile.getParentFile().mkdirs();
+ homeFile.createNewFile();
+ FileUtils.write(homeFile, "-- init hive file for test ");
+ setEnv("HIVE_HOME", homeFile.getParentFile().getParentFile().getAbsolutePath());
+ setEnv("HIVE_CONF_DIR", homeFile.getParentFile().getAbsolutePath());
+ CliSessionState sessionState = new CliSessionState(new HiveConf());
+
+ ByteArrayOutputStream data = new ByteArrayOutputStream();
+ NoExitSecurityManager securityManager = new NoExitSecurityManager();
+
+ sessionState.err = new PrintStream(data);
+ sessionState.out = System.out;
+ try {
+ CliSessionState.start(sessionState);
+ CliDriver cliDriver = new CliDriver();
+ cliDriver.processInitFiles(sessionState);
+ assertTrue(data.toString().contains(
+ "Putting the global hiverc in $HIVE_HOME/bin/.hiverc is deprecated. " +
+ "Please use $HIVE_CONF_DIR/.hiverc instead."));
+ FileUtils.write(homeFile, "bla bla bla");
+ // if init file contains incorrect row
+ try {
+ cliDriver.processInitFiles(sessionState);
+ fail("should be exit");
+ } catch (ExitException e) {
+ assertEquals(40000, e.getStatus());
+ }
+ setEnv("HIVE_HOME", null);
+ try {
+ cliDriver.processInitFiles(sessionState);
+ fail("should be exit");
+ } catch (ExitException e) {
+ assertEquals(40000, e.getStatus());
+ }
+
+ } finally {
+ // restore data
+ setEnv("HIVE_HOME", oldHiveHome);
+ setEnv("HIVE_CONF_DIR", oldHiveConfDir);
+ FileUtils.deleteDirectory(new File(tmpDir));
+ }
+
+ File f = File.createTempFile("hive", "test");
+ FileUtils.write(f, "bla bla bla");
+ try {
+ sessionState.initFiles = Arrays.asList(new String[] {f.getAbsolutePath()});
+ CliDriver cliDriver = new CliDriver();
+ cliDriver.processInitFiles(sessionState);
+ fail("should be exit");
+ } catch (ExitException e) {
+ assertEquals(40000, e.getStatus());
+ assertTrue(data.toString().contains("cannot recognize input near 'bla' 'bla' 'bla'"));
+
+ } finally {
+ securityManager.resetSecurityManager();
+ }
+ }
+
+
+ private static void setEnv(String key, String value) throws Exception {
+ Class[] classes = Collections.class.getDeclaredClasses();
+ Map<String, String> env = (Map<String, String>) System.getenv();
+ for (Class cl : classes) {
+ if ("java.util.Collections$UnmodifiableMap".equals(cl.getName())) {
+ Field field = cl.getDeclaredField("m");
+ field.setAccessible(true);
+ Object obj = field.get(env);
+ Map<String, String> map = (Map<String, String>) obj;
+ if (value == null) {
+ map.remove(key);
+ } else {
+ map.put(key, value);
+ }
+ }
+ }
+ }
+
+
+ private static class FakeCliDriver extends CliDriver {
+
+ @Override
+ protected ConsoleReader getConsoleReader() throws IOException {
+ ConsoleReader reslt = new FakeConsoleReader();
+ return reslt;
+ }
+
+ }
+
+ private static class FakeConsoleReader extends ConsoleReader {
+ private int counter = 0;
+ File temp = null;
+
+ public FakeConsoleReader() throws IOException {
+ super();
+
+ }
+
+ @Override
+ public String readLine(String prompt) throws IOException {
+ FileWriter writer;
+ switch (counter++) {
+ case 0:
+ return "!echo test message;";
+ case 1:
+ temp = File.createTempFile("hive", "test");
+ temp.deleteOnExit();
+ return "source " + temp.getAbsolutePath() + ";";
+ case 2:
+ temp = File.createTempFile("hive", "test");
+ temp.deleteOnExit();
+ writer = new FileWriter(temp);
+ writer.write("bla bla bla");
+ writer.close();
+ return "list file file://" + temp.getAbsolutePath() + ";";
+ case 3:
+ return "!echo ";
+ case 4:
+ return "test message;";
+ case 5:
+ return "source fakeFile;";
+ case 6:
+ temp = File.createTempFile("hive", "test");
+ temp.deleteOnExit();
+ writer = new FileWriter(temp);
+ writer.write("source fakeFile;");
+ writer.close();
+ return "list file file://" + temp.getAbsolutePath() + ";";
+
+
+ // drop table over10k;
+ default:
+ return null;
+ }
+ }
+ }
+
+ private static class NoExitSecurityManager extends SecurityManager {
+
+ public SecurityManager parentSecurityManager;
+
+ public NoExitSecurityManager() {
+ super();
+ parentSecurityManager = System.getSecurityManager();
+ System.setSecurityManager(this);
+ }
+
+ @Override
+ public void checkPermission(Permission perm, Object context) {
+ if (parentSecurityManager != null) {
+ parentSecurityManager.checkPermission(perm, context);
+ }
+ }
+
+ @Override
+ public void checkPermission(Permission perm) {
+ if (parentSecurityManager != null) {
+ parentSecurityManager.checkPermission(perm);
+ }
+ }
+
+ @Override
+ public void checkExit(int status) {
+ throw new ExitException(status);
+ }
+
+ public void resetSecurityManager() {
+ System.setSecurityManager(parentSecurityManager);
+ }
+ }
+
+ private static class ExitException extends RuntimeException {
+ int status;
+
+ public ExitException(int status) {
+ this.status = status;
+ }
+
+ public int getStatus() {
+ return status;
+ }
+ }
+
+ private static class MyCliSessionState extends CliSessionState {
+
+ public enum ClientResult {
+ RETURN_OK, RETURN_SERVER_EXCEPTION, RETURN_T_EXCEPTION
+ };
+
+ private final ClientResult result;
+
+ public MyCliSessionState(HiveConf conf, ClientResult result) {
+ super(conf);
+ this.result = result;
+ }
+
+ @Override
+ public boolean isRemoteMode() {
+ return true;
+ }
+
+ @Override
+ public HiveClient getClient() {
+
+ HiveClient result = mock(HiveClient.class);
+ if (ClientResult.RETURN_OK.equals(this.result)) {
+ List<String> fetchResult = new ArrayList<String>(1);
+ fetchResult.add("test result");
+ try {
+ when(result.fetchN(anyInt())).thenReturn(fetchResult);
+ } catch (HiveServerException e) {
+ } catch (Exception e) {
+ }
+ } else if (ClientResult.RETURN_SERVER_EXCEPTION.equals(this.result)) {
+ HiveServerException exception = new HiveServerException("test HiveServerException", 10,
+ "sql state");
+ try {
+ when(result.fetchN(anyInt())).thenThrow(exception);
+
+ when(result.fetchN(anyInt())).thenThrow(exception);
+ } catch (TException e) {
+ ;
+ }
+ return result;
+ } else if (ClientResult.RETURN_T_EXCEPTION.equals(this.result)) {
+ TException exception = new TException("test TException");
+ try {
+ // org.mockito.Mockito.
+ doThrow(exception).when(result).clean();
+ when(result.fetchN(anyInt())).thenThrow(exception);
+ } catch (TException e) {
+ e.printStackTrace();
+ }
+ return result;
+ }
+ return result;
+ }
+
+ }
+
+
}
Modified: hive/branches/vectorization/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1514554&r1=1514553&r2=1514554&view=diff
==============================================================================
--- hive/branches/vectorization/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/branches/vectorization/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Fri Aug 16 01:21:54 2013
@@ -344,6 +344,7 @@ public class HiveConf extends Configurat
METASTORE_EXECUTE_SET_UGI("hive.metastore.execute.setugi", false),
METASTORE_PARTITION_NAME_WHITELIST_PATTERN(
"hive.metastore.partition.name.whitelist.pattern", ""),
+ METASTORE_TRY_DIRECT_SQL("hive.metastore.try.direct.sql", true),
METASTORE_DISALLOW_INCOMPATIBLE_COL_TYPE_CHANGES(
"hive.metastore.disallow.incompatible.col.type.changes", false),
@@ -383,6 +384,9 @@ public class HiveConf extends Configurat
// whether session is running in silent mode or not
HIVESESSIONSILENT("hive.session.silent", false),
+ // Whether to enable history for this session
+ HIVE_SESSION_HISTORY_ENABLED("hive.session.history.enabled", false),
+
// query being executed (multiple per session)
HIVEQUERYSTRING("hive.query.string", ""),
@@ -501,13 +505,17 @@ public class HiveConf extends Configurat
// Maximum fraction of heap that can be used by ORC file writers
HIVE_ORC_FILE_MEMORY_POOL("hive.exec.orc.memory.pool", 0.5f), // 50%
+ // use 0.11 version of RLE encoding. if this conf is not defined or any
+ // other value specified, ORC will use the new RLE encoding
+ HIVE_ORC_WRITE_FORMAT("hive.exec.orc.write.format", "0.11"),
+
+ HIVE_ORC_DICTIONARY_KEY_SIZE_THRESHOLD("hive.exec.orc.dictionary.key.size.threshold", 0.8f),
HIVESKEWJOIN("hive.optimize.skewjoin", false),
HIVECONVERTJOIN("hive.auto.convert.join", true),
HIVECONVERTJOINNOCONDITIONALTASK("hive.auto.convert.join.noconditionaltask", true),
HIVECONVERTJOINNOCONDITIONALTASKTHRESHOLD("hive.auto.convert.join.noconditionaltask.size",
10000000L),
- HIVEOPTIMIZEMAPJOINFOLLOWEDBYMR("hive.optimize.mapjoin.mapreduce", false),
HIVESKEWJOINKEY("hive.skewjoin.key", 100000),
HIVESKEWJOINMAPJOINNUMMAPTASK("hive.skewjoin.mapjoin.map.tasks", 10000),
HIVESKEWJOINMAPJOINMINSPLIT("hive.skewjoin.mapjoin.min.split", 33554432L), //32M
@@ -728,6 +736,7 @@ public class HiveConf extends Configurat
HIVE_SERVER2_THRIFT_PORT("hive.server2.thrift.port", 10000),
HIVE_SERVER2_THRIFT_BIND_HOST("hive.server2.thrift.bind.host", ""),
+ HIVE_SERVER2_THRIFT_SASL_QOP("hive.server2.thrift.sasl.qop", "auth"),
// HiveServer2 auth configuration
@@ -739,6 +748,7 @@ public class HiveConf extends Configurat
HIVE_SERVER2_PLAIN_LDAP_DOMAIN("hive.server2.authentication.ldap.Domain", null),
HIVE_SERVER2_CUSTOM_AUTHENTICATION_CLASS("hive.server2.custom.authentication.class", null),
HIVE_SERVER2_ENABLE_DOAS("hive.server2.enable.doAs", true),
+ HIVE_SERVER2_TABLE_TYPE_MAPPING("hive.server2.table.type.mapping", "HIVE"),
HIVE_CONF_RESTRICTED_LIST("hive.conf.restricted.list", null),