Index: build-common.xml
===================================================================
--- build-common.xml (revision 763135)
+++ build-common.xml (working copy)
@@ -20,6 +20,10 @@
+
+
+
+
@@ -48,6 +52,12 @@
+
+
+
+
+
@@ -297,4 +307,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionManager.java
===================================================================
--- hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionManager.java (revision 763135)
+++ hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionManager.java (working copy)
@@ -119,10 +119,10 @@
* because we need to set parameters the client is not aware of. One such
* parameter is the command line arguments the server was started with.
*
- * @param sessionname
+ * @param a
+ * Authenticated user
+ * @param sessionName
* Represents the session name
- * @param sessionpass
- * the session password, can be ""
* @return a new SessionItem or null if a session with that name already
* exists
*/
@@ -201,4 +201,4 @@
return this.items.get(auth);
}
-}
\ No newline at end of file
+}
Index: hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionItem.java
===================================================================
--- hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionItem.java (revision 763135)
+++ hwi/src/java/org/apache/hadoop/hive/hwi/HWISessionItem.java (working copy)
@@ -196,7 +196,7 @@
*
* @param wanted
* a ConfVar
- * @return
+ * @return Value of the configuration variable.
*/
public String getHiveConfVar(HiveConf.ConfVars wanted) throws HWIException {
String result = null;
Index: hwi/build.xml
===================================================================
--- hwi/build.xml (revision 763135)
+++ hwi/build.xml (working copy)
@@ -34,4 +34,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: docs/changes/ChangesFancyStyle.css
===================================================================
--- docs/changes/ChangesFancyStyle.css (revision 0)
+++ docs/changes/ChangesFancyStyle.css (revision 0)
@@ -0,0 +1,170 @@
+/*
+* 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.
+*/
+/**
+ * General
+ */
+
+img { border: 0; }
+
+#content table {
+ border: 0;
+ width: 100%;
+}
+/*Hack to get IE to render the table at 100%*/
+* html #content table { margin-left: -3px; }
+
+#content th,
+#content td {
+ margin: 0;
+ padding: 0;
+ vertical-align: top;
+}
+
+.clearboth {
+ clear: both;
+}
+
+.note, .warning, .fixme {
+ border: solid black 1px;
+ margin: 1em 3em;
+}
+
+.note .label {
+ background: #369;
+ color: white;
+ font-weight: bold;
+ padding: 5px 10px;
+}
+.note .content {
+ background: #F0F0FF;
+ color: black;
+ line-height: 120%;
+ font-size: 90%;
+ padding: 5px 10px;
+}
+.warning .label {
+ background: #C00;
+ color: white;
+ font-weight: bold;
+ padding: 5px 10px;
+}
+.warning .content {
+ background: #FFF0F0;
+ color: black;
+ line-height: 120%;
+ font-size: 90%;
+ padding: 5px 10px;
+}
+.fixme .label {
+ background: #C6C600;
+ color: black;
+ font-weight: bold;
+ padding: 5px 10px;
+}
+.fixme .content {
+ padding: 5px 10px;
+}
+
+/**
+ * Typography
+ */
+
+body {
+ font-family: verdana, "Trebuchet MS", arial, helvetica, sans-serif;
+ font-size: 100%;
+}
+
+#content {
+ font-family: Georgia, Palatino, Times, serif;
+ font-size: 95%;
+}
+#tabs {
+ font-size: 70%;
+}
+#menu {
+ font-size: 80%;
+}
+#footer {
+ font-size: 70%;
+}
+
+h1, h2, h3, h4, h5, h6 {
+ font-family: "Trebuchet MS", verdana, arial, helvetica, sans-serif;
+ font-weight: bold;
+ margin-top: 1em;
+ margin-bottom: .5em;
+}
+
+h1 {
+ margin-top: 0;
+ margin-bottom: 1em;
+ font-size: 1.4em;
+ background-color: 73CAFF
+}
+#content h1 {
+ font-size: 160%;
+ margin-bottom: .5em;
+}
+#menu h1 {
+ margin: 0;
+ padding: 10px;
+ background: #336699;
+ color: white;
+}
+h2 {
+ font-size: 120%;
+ background-color: 73CAFF
+}
+h3 { font-size: 100%; }
+h4 { font-size: 90%; }
+h5 { font-size: 80%; }
+h6 { font-size: 75%; }
+
+p {
+ line-height: 120%;
+ text-align: left;
+ margin-top: .5em;
+ margin-bottom: 1em;
+}
+
+#content li,
+#content th,
+#content td,
+#content li ul,
+#content li ol{
+ margin-top: .5em;
+ margin-bottom: .5em;
+}
+
+
+#content li li,
+#minitoc-area li{
+ margin-top: 0em;
+ margin-bottom: 0em;
+}
+
+#content .attribution {
+ text-align: right;
+ font-style: italic;
+ font-size: 85%;
+ margin-top: 1em;
+}
+
+.codefrag {
+ font-family: "Courier New", Courier, monospace;
+ font-size: 110%;
+}
Index: docs/changes/changes2html.pl
===================================================================
--- docs/changes/changes2html.pl (revision 0)
+++ docs/changes/changes2html.pl (revision 0)
@@ -0,0 +1,282 @@
+#!/usr/bin/perl
+#
+# Transforms Lucene Java's CHANGES.txt into Changes.html
+#
+# Input is on STDIN, output is to STDOUT
+#
+#
+# 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.
+#
+
+use strict;
+use warnings;
+
+my $jira_url_prefix = 'http://issues.apache.org/jira/browse/';
+my $title = undef;
+my $release = undef;
+my $sections = undef;
+my $items = undef;
+my $first_relid = undef;
+my $second_relid = undef;
+my @releases = ();
+
+my @lines = <>; # Get all input at once
+
+#
+# Parse input and build hierarchical release structure in @releases
+#
+for (my $line_num = 0 ; $line_num <= $#lines ; ++$line_num) {
+ $_ = $lines[$line_num];
+ next unless (/\S/); # Skip blank lines
+
+ unless ($title) {
+ if (/\S/) {
+ s/^\s+//; # Trim leading whitespace
+ s/\s+$//; # Trim trailing whitespace
+ }
+ $title = $_;
+ next;
+ }
+
+ if (/^(Release)|(Trunk)/) { # Release headings
+ $release = $_;
+ $sections = [];
+ push @releases, [ $release, $sections ];
+ ($first_relid = lc($release)) =~ s/\s+/_/g if ($#releases == 0);
+ ($second_relid = lc($release)) =~ s/\s+/_/g if ($#releases == 1);
+ $items = undef;
+ next;
+ }
+
+ # Section heading: 2 leading spaces, words all capitalized
+ if (/^ ([A-Z]+)\s*/) {
+ my $heading = $_;
+ $items = [];
+ push @$sections, [ $heading, $items ];
+ next;
+ }
+
+ # Handle earlier releases without sections - create a headless section
+ unless ($items) {
+ $items = [];
+ push @$sections, [ undef, $items ];
+ }
+
+ my $type;
+ if (@$items) { # A list item has been encountered in this section before
+ $type = $items->[0]; # 0th position of items array is list type
+ } else {
+ $type = get_list_type($_);
+ push @$items, $type;
+ }
+
+ if ($type eq 'numbered') { # The modern items list style
+ # List item boundary is another numbered item or an unindented line
+ my $line;
+ my $item = $_;
+ $item =~ s/^(\s{0,2}\d+\.\s*)//; # Trim the leading item number
+ my $leading_ws_width = length($1);
+ $item =~ s/\s+$//; # Trim trailing whitespace
+ $item .= "\n";
+
+ while ($line_num < $#lines
+ and ($line = $lines[++$line_num]) !~ /^(?:\s{0,2}\d+\.\s*\S|\S)/) {
+ $line =~ s/^\s{$leading_ws_width}//; # Trim leading whitespace
+ $line =~ s/\s+$//; # Trim trailing whitespace
+ $item .= "$line\n";
+ }
+ $item =~ s/\n+\Z/\n/; # Trim trailing blank lines
+ push @$items, $item;
+ --$line_num unless ($line_num == $#lines);
+ } elsif ($type eq 'paragraph') { # List item boundary is a blank line
+ my $line;
+ my $item = $_;
+ $item =~ s/^(\s+)//;
+ my $leading_ws_width = defined($1) ? length($1) : 0;
+ $item =~ s/\s+$//; # Trim trailing whitespace
+ $item .= "\n";
+
+ while ($line_num < $#lines and ($line = $lines[++$line_num]) =~ /\S/) {
+ $line =~ s/^\s{$leading_ws_width}//; # Trim leading whitespace
+ $line =~ s/\s+$//; # Trim trailing whitespace
+ $item .= "$line\n";
+ }
+ push @$items, $item;
+ --$line_num unless ($line_num == $#lines);
+ } else { # $type is one of the bulleted types
+ # List item boundary is another bullet or a blank line
+ my $line;
+ my $item = $_;
+ $item =~ s/^(\s*$type\s*)//; # Trim the leading bullet
+ my $leading_ws_width = length($1);
+ $item =~ s/\s+$//; # Trim trailing whitespace
+ $item .= "\n";
+
+ while ($line_num < $#lines
+ and ($line = $lines[++$line_num]) !~ /^\s*(?:$type|\Z)/) {
+ $line =~ s/^\s{$leading_ws_width}//; # Trim leading whitespace
+ $line =~ s/\s+$//; # Trim trailing whitespace
+ $item .= "$line\n";
+ }
+ push @$items, $item;
+ --$line_num unless ($line_num == $#lines);
+ }
+}
+
+#
+# Print HTML-ified version to STDOUT
+#
+print<<"__HTML_HEADER__";
+
+
+
+ $title
+
+
+
+
+
+
+
+
+$title
+
+__HTML_HEADER__
+
+my $heading;
+my $relcnt = 0;
+my $header = 'h2';
+for my $rel (@releases) {
+ if (++$relcnt == 3) {
+ $header = 'h3';
+ print "\n";
+ print "\n"
+ }
+
+ ($release, $sections) = @$rel;
+
+ # The first section heading is undefined for the older sectionless releases
+ my $has_release_sections = $sections->[0][0];
+
+ (my $relid = lc($release)) =~ s/\s+/_/g;
+ print "<$header>";
+ print "$release";
+ print "$header>\n";
+ print "\n"
+ if ($has_release_sections);
+
+ for my $section (@$sections) {
+ ($heading, $items) = @$section;
+ (my $sectid = lc($heading)) =~ s/\s+/_/g;
+ my $numItemsStr = $#{$items} > 0 ? "($#{$items})" : "(none)";
+
+ print " - ",
+ ($heading || ''), " $numItemsStr\n"
+ if ($has_release_sections);
+
+ my $list_type = $items->[0] || '';
+ my $list = ($has_release_sections || $list_type eq 'numbered' ? 'ol' : 'ul');
+ my $listid = $sectid ? "$relid.$sectid" : $relid;
+ print " <$list id=\"$listid\">\n";
+
+ for my $itemnum (1..$#{$items}) {
+ my $item = $items->[$itemnum];
+ $item =~ s:&:&:g; # Escape HTML metachars
+ $item =~ s:<:<:g;
+ $item =~ s:>:>:g;
+
+ $item =~ s:\s*(\([^)"]+?\))\s*$:
$1:; # Separate attribution
+ $item =~ s:\n{2,}:\n\n:g; # Keep paragraph breaks
+ $item =~ s{(?:${jira_url_prefix})?(HADOOP-\d+)} # Link to JIRA
+ {$1}g;
+ print " - $item
\n";
+ }
+ print " $list>\n";
+ print " \n" if ($has_release_sections);
+ }
+ print "
\n" if ($has_release_sections);
+}
+print "
\n" if ($relcnt > 3);
+print "\n\n";
+
+
+#
+# Subroutine: get_list_type
+#
+# Takes one parameter:
+#
+# - The first line of a sub-section/point
+#
+# Returns one scalar:
+#
+# - The list type: 'numbered'; or one of the bulleted types '-', or '.' or
+# 'paragraph'.
+#
+sub get_list_type {
+ my $first_list_item_line = shift;
+ my $type = 'paragraph'; # Default to paragraph type
+
+ if ($first_list_item_line =~ /^\s{0,2}\d+\.\s+\S+/) {
+ $type = 'numbered';
+ } elsif ($first_list_item_line =~ /^\s*([-.])\s+\S+/) {
+ $type = $1;
+ }
+ return $type;
+}
+
+1;
Property changes on: docs/changes/changes2html.pl
___________________________________________________________________
Added: svn:executable
+ *
Index: docs/changes/ChangesSimpleStyle.css
===================================================================
--- docs/changes/ChangesSimpleStyle.css (revision 0)
+++ docs/changes/ChangesSimpleStyle.css (revision 0)
@@ -0,0 +1,49 @@
+/*
+* 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.
+*/
+
+body {
+ font-family: Courier New, monospace;
+ font-size: 10pt;
+}
+
+h1 {
+ font-family: Courier New, monospace;
+ font-size: 10pt;
+}
+
+h2 {
+ font-family: Courier New, monospace;
+ font-size: 10pt;
+}
+
+h3 {
+ font-family: Courier New, monospace;
+ font-size: 10pt;
+}
+
+a:link {
+ color: blue;
+}
+
+a:visited {
+ color: purple;
+}
+
+li {
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
Index: build.xml
===================================================================
--- build.xml (revision 763135)
+++ build.xml (working copy)
@@ -20,6 +20,12 @@
+
+
+
+
+
+
@@ -30,8 +36,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -156,7 +203,7 @@
-
+
@@ -212,6 +259,9 @@
+
+
+
@@ -252,4 +302,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: service/build.xml
===================================================================
--- service/build.xml (revision 763135)
+++ service/build.xml (working copy)
@@ -56,4 +56,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: jdbc/build.xml
===================================================================
--- jdbc/build.xml (revision 763135)
+++ jdbc/build.xml (working copy)
@@ -48,4 +48,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyLong.java
===================================================================
--- serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyLong.java (revision 763135)
+++ serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyLong.java (working copy)
@@ -159,8 +159,8 @@
* a variable. That's one of the reasons that we don't make radix a
* parameter here.
*
+ * @param out the outputstream to write to
* @param i an int to write out
- * @return String the representation of the argument
* @throws IOException
*/
public static void writeUTF8(OutputStream out, long i) throws IOException {
Index: serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyMap.java
===================================================================
--- serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyMap.java (revision 763135)
+++ serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyMap.java (working copy)
@@ -283,7 +283,7 @@
* @param itemSeparator The separator between different entries.
* @param keyValueSeparator The separator between key and value.
* @param nullSequence The byte sequence representing NULL.
- * @return
+ * @return the map object
*/
public Map