http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java index 6d8f9cf..97afffb 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java @@ -59,7 +59,7 @@ public abstract class LicenseMojo extends AbstractMojo { protected List<Override> overrides = new ArrayList<>(); @Parameter - protected String [] models = new String [0]; + protected String[] models = new String[0]; @Parameter protected List<LicenseSpec> licenses = new ArrayList<>(); @@ -73,31 +73,31 @@ public abstract class LicenseMojo extends AbstractMojo { @Parameter protected List<DependencySet> dependencySets = new ArrayList<>(); - @Parameter( defaultValue = "${project}", readonly = true ) + @Parameter(defaultValue = "${project}", readonly = true) protected MavenProject project; - @Parameter( property = "localRepository", required = true, readonly = true ) + @Parameter(property = "localRepository", required = true, readonly = true) private ArtifactRepository localRepository; - @Parameter( property = "project.remoteArtifactRepositories", required = true, readonly = true ) + @Parameter(property = "project.remoteArtifactRepositories", required = true, readonly = true) private List<ArtifactRepository> remoteRepositories; - @Component( role = MavenProjectBuilder.class ) + @Component(role = MavenProjectBuilder.class) protected MavenProjectBuilder projectBuilder; @Component private ModelInheritanceAssembler assembler; - @Parameter( defaultValue = "${session}", required = true, readonly = true ) + @Parameter(defaultValue = "${session}", required = true, readonly = true) protected MavenSession session; @Component protected ArtifactResolver artifactResolver; - @Parameter ( required = true ) + @Parameter(required = true) private String location; - @Parameter ( required = true ) + @Parameter(required = true) protected File licenseDirectory; private Map<String, MavenProject> projectCache = new HashMap<>(); @@ -113,8 +113,7 @@ public abstract class LicenseMojo extends AbstractMojo { return licenseMap; } - protected void init() throws MojoExecutionException, MalformedURLException, - ProjectBuildingException { + protected void init() throws MojoExecutionException, MalformedURLException, ProjectBuildingException { excludedScopes.add("system"); excludePatterns = compileExcludePatterns(); supplementModels = SupplementalModelHelper.loadSupplements(getLog(), models); @@ -144,7 +143,7 @@ public abstract class LicenseMojo extends AbstractMojo { } private void addDependencyToLicenseMap(MavenProject depProject, List<Pair<String, String>> depLicenses, - String depLocation) { + String depLocation) { final String depGav = toGav(depProject); getLog().debug("adding " + depGav + ", location: " + depLocation); final MutableBoolean usedMetric = new MutableBoolean(false); @@ -152,17 +151,16 @@ public abstract class LicenseMojo extends AbstractMojo { Collections.sort(depLicenses, (o1, o2) -> { final int metric1 = getLicenseMetric(o1.getLeft()); final int metric2 = getLicenseMetric(o2.getLeft()); - usedMetric.setValue(usedMetric.booleanValue() - || metric1 != LicenseSpec.UNDEFINED_LICENSE_METRIC + usedMetric.setValue(usedMetric.booleanValue() || metric1 != LicenseSpec.UNDEFINED_LICENSE_METRIC || metric2 != LicenseSpec.UNDEFINED_LICENSE_METRIC); return Integer.compare(metric1, metric2); }); if (usedMetric.booleanValue()) { - getLog().info("Multiple licenses for " + depGav + ": " + depLicenses - + "; taking lowest metric: " + depLicenses.get(0)); + getLog().info("Multiple licenses for " + depGav + ": " + depLicenses + "; taking lowest metric: " + + depLicenses.get(0)); } else { - getLog().warn("Multiple licenses for " + depGav + ": " + depLicenses - + "; taking first listed: " + depLicenses.get(0)); + getLog().warn("Multiple licenses for " + depGav + ": " + depLicenses + "; taking first listed: " + + depLicenses.get(0)); } } else if (depLicenses.isEmpty()) { getLog().info("no license defined in model for " + depGav); @@ -179,8 +177,7 @@ public abstract class LicenseMojo extends AbstractMojo { } catch (MalformedURLException e) { // we encounter this a lot. Log a warning, and use an annotated key final String fakeLicenseUrl = depGav.replaceAll(":", "--") + "_" + licenseUrl; - getLog().info("- URL for " + depGav + " is malformed: " + licenseUrl + "; using: " - + fakeLicenseUrl); + getLog().info("- URL for " + depGav + " is malformed: " + licenseUrl + "; using: " + fakeLicenseUrl); licenseUrl = fakeLicenseUrl; } } @@ -196,7 +193,7 @@ public abstract class LicenseMojo extends AbstractMojo { urlToLicenseMap.put(licenseUrl, license); for (String alias : license.getAliasUrls()) { if (!urlToLicenseMap.containsKey(alias)) { - urlToLicenseMap.put(alias ,license); + urlToLicenseMap.put(alias, license); } } } else if (license.getDisplayName() == null && spec.getDisplayName() != null) { @@ -216,11 +213,11 @@ public abstract class LicenseMojo extends AbstractMojo { private void buildUrlLicenseMap() throws MojoExecutionException { for (LicenseSpec license : licenses) { - if (urlToLicenseMap.put(license.getUrl() ,license) != null) { + if (urlToLicenseMap.put(license.getUrl(), license) != null) { throw new MojoExecutionException("Duplicate URL mapping: " + license.getUrl()); } for (String alias : license.getAliasUrls()) { - if (urlToLicenseMap.put(alias ,license) != null) { + if (urlToLicenseMap.put(alias, license) != null) { throw new MojoExecutionException("Duplicate URL mapping: " + alias); } } @@ -238,20 +235,19 @@ public abstract class LicenseMojo extends AbstractMojo { if (dep == null) { getLog().warn("Unused override dependency " + gav + "; ignoring..."); } else { - final List<Pair<String, String>> newLicense = Collections.singletonList( - new ImmutablePair<>(override.getUrl(), override.getName())); + final List<Pair<String, String>> newLicense = + Collections.singletonList(new ImmutablePair<>(override.getUrl(), override.getName())); List<Pair<String, String>> prevLicense = dependencyLicenseMap.put(dep, newLicense); - getLog().warn("license list for " + toGav(dep) - + " changed with <override>; was: " + prevLicense + getLog().warn("license list for " + toGav(dep) + " changed with <override>; was: " + prevLicense + ", now: " + newLicense); } } return dependencyLicenseMap; } - private void gatherProjectDependencies(MavenProject project, Map<MavenProject, - List<Pair<String, String>>> dependencyLicenseMap, Map<String, MavenProject> dependencyGavMap) - throws ProjectBuildingException { + private void gatherProjectDependencies(MavenProject project, + Map<MavenProject, List<Pair<String, String>>> dependencyLicenseMap, + Map<String, MavenProject> dependencyGavMap) throws ProjectBuildingException { final Set dependencyArtifacts = project.getArtifacts(); if (dependencyArtifacts != null) { for (Object depArtifactObj : dependencyArtifacts) { @@ -264,8 +260,7 @@ public abstract class LicenseMojo extends AbstractMojo { for (Object license : dep.getLicenses()) { final License license1 = (License) license; String url = license1.getUrl() != null ? license1.getUrl() - : (license1.getName() != null ? license1.getName() - : "LICENSE_EMPTY_NAME_URL"); + : (license1.getName() != null ? license1.getName() : "LICENSE_EMPTY_NAME_URL"); licenseUrls.add(new ImmutablePair<>(url, license1.getName())); } dependencyLicenseMap.put(dep, licenseUrls); @@ -286,22 +281,21 @@ public abstract class LicenseMojo extends AbstractMojo { throw new ProjectBuildingException(key, "Error creating dependent artifacts", e); } - Model supplement = supplementModels.get( - SupplementalModelHelper.generateSupplementMapKey(depObj.getGroupId(), depObj.getArtifactId())); + Model supplement = supplementModels + .get(SupplementalModelHelper.generateSupplementMapKey(depObj.getGroupId(), depObj.getArtifactId())); if (supplement != null) { Model merged = SupplementalModelHelper.mergeModels(assembler, depProj.getModel(), supplement); - Set<String> origLicenses = depProj.getModel().getLicenses().stream().map(License::getUrl) - .collect(Collectors.toSet()); - Set<String> newLicenses = merged.getLicenses().stream().map(License::getUrl) - .collect(Collectors.toSet()); + Set<String> origLicenses = + depProj.getModel().getLicenses().stream().map(License::getUrl).collect(Collectors.toSet()); + Set<String> newLicenses = + merged.getLicenses().stream().map(License::getUrl).collect(Collectors.toSet()); if (!origLicenses.equals(newLicenses)) { - getLog().warn("license list for " + toGav(depProj) - + " changed with supplemental model; was: " + origLicenses - + ", now: " + newLicenses); + getLog().warn("license list for " + toGav(depProj) + " changed with supplemental model; was: " + + origLicenses + ", now: " + newLicenses); } depProj = new MavenProject(merged); - depProj.setArtifact( depObj ); - depProj.setVersion( depObj.getVersion() ); + depProj.setArtifact(depObj); + depProj.setVersion(depObj.getVersion()); } depProj.getArtifact().setScope(depObj.getScope()); projectCache.put(key, depProj); @@ -354,4 +348,3 @@ public abstract class LicenseMojo extends AbstractMojo { return artifactResolver; } } -
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseSpec.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseSpec.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseSpec.java index f2ff5dd..cd955d9 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseSpec.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseSpec.java @@ -46,8 +46,8 @@ public class LicenseSpec { @JsonCreator public LicenseSpec(@JsonProperty("aliasUrls") List<String> aliasUrls, @JsonProperty("content") String content, - @JsonProperty("contentFile") String contentFile, @JsonProperty("displayName") String displayName, - @JsonProperty("metric") int metric, @JsonProperty("url") String url) { + @JsonProperty("contentFile") String contentFile, @JsonProperty("displayName") String displayName, + @JsonProperty("metric") int metric, @JsonProperty("url") String url) { this.aliasUrls = aliasUrls; this.content = content; this.contentFile = contentFile; @@ -77,8 +77,7 @@ public class LicenseSpec { String file; try { URI uri = new URI(url); - file = ((uri.getHost() != null ? uri.getHost() : "") - + uri.getPath()).replaceAll(BAD_CHARS, "_"); + file = ((uri.getHost() != null ? uri.getHost() : "") + uri.getPath()).replaceAll(BAD_CHARS, "_"); } catch (URISyntaxException e) { file = url.replaceAll(BAD_CHARS, "_"); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseUtil.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseUtil.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseUtil.java index 30588d4..a80dc1d 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseUtil.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseUtil.java @@ -91,7 +91,7 @@ public class LicenseUtil { private static void doTrim(Writer out, BufferedReader reader, int extraPadding, int wrapLength) throws IOException { boolean head = true; int empty = 0; - for (String line = reader.readLine(); line != null; line = reader.readLine() ) { + for (String line = reader.readLine(); line != null; line = reader.readLine()) { if ("".equals(line.trim())) { if (!head) { empty++; @@ -136,7 +136,7 @@ public class LicenseUtil { continue; } String fullyTrimmed = line.trim(); - freeSpaces = Math.min(freeSpaces, rightTrimmed.length() - fullyTrimmed.length()); + freeSpaces = Math.min(freeSpaces, rightTrimmed.length() - fullyTrimmed.length()); maxLineLength = Math.max(maxLineLength, fullyTrimmed.length()); } return new ImmutablePair<>(freeSpaces, maxLineLength); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/Override.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/Override.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/Override.java index c99a047..aa532e6 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/Override.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/Override.java @@ -18,7 +18,7 @@ */ package org.apache.hyracks.maven.license; -public class Override { +public class Override { @SuppressWarnings("unused") // set by Maven plugin configuration private String url; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/SourcePointerResolver.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/SourcePointerResolver.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/SourcePointerResolver.java index c713b08..0a24a76 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/SourcePointerResolver.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/SourcePointerResolver.java @@ -82,15 +82,14 @@ public class SourcePointerResolver { } private void ensureCDDLSourcesPointer(Collection<Project> projects, ArtifactRepository central, - ArtifactResolutionRequest request) - throws ProjectBuildingException, IOException { + ArtifactResolutionRequest request) throws ProjectBuildingException, IOException { for (Project p : projects) { if (p.getSourcePointer() != null) { continue; } mojo.getLog().debug("finding sources for artifact: " + p); - Artifact sourcesArtifact = new DefaultArtifact(p.getGroupId(), p.getArtifactId(), - p.getVersion(), Artifact.SCOPE_COMPILE, "jar", "sources", null); + Artifact sourcesArtifact = new DefaultArtifact(p.getGroupId(), p.getArtifactId(), p.getVersion(), + Artifact.SCOPE_COMPILE, "jar", "sources", null); MavenProject mavenProject = mojo.resolveDependency(sourcesArtifact); sourcesArtifact.setArtifactHandler(mavenProject.getArtifact().getArtifactHandler()); final ArtifactRepository localRepo = mojo.getSession().getLocalRepository(); @@ -162,7 +161,7 @@ public class SourcePointerResolver { @java.lang.Override public String pathOfLocalRepositoryMetadata(ArtifactMetadata artifactMetadata, - ArtifactRepository artifactRepository) { + ArtifactRepository artifactRepository) { return null; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/freemarker/IndentDirective.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/freemarker/IndentDirective.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/freemarker/IndentDirective.java index 77b8afd..f58b419 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/freemarker/IndentDirective.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/freemarker/IndentDirective.java @@ -43,7 +43,7 @@ public class IndentDirective implements TemplateDirectiveModel { private static final String PARAM_NAME_WRAP = "wrap"; @Override - public void execute(Environment env, Map params, TemplateModel [] loopVars, TemplateDirectiveBody body) + public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) throws TemplateException, IOException { int numSpaces = -1; @@ -106,8 +106,7 @@ public class IndentDirective implements TemplateDirectiveModel { } private TemplateModelException paramException(String paramName, String message) throws TemplateModelException { - return new TemplateModelException( - "The '" + paramName + "' parameter " + message); + return new TemplateModelException("The '" + paramName + "' parameter " + message); } private static class IndentingWriter extends Writer { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/freemarker/LoadFileDirective.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/freemarker/LoadFileDirective.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/freemarker/LoadFileDirective.java index 67da23f..2b03fe2 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/freemarker/LoadFileDirective.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/freemarker/LoadFileDirective.java @@ -46,9 +46,7 @@ public class LoadFileDirective implements TemplateDirectiveModel { private static final String PARAM_DEFAULT_TEXT = "defaultOnMissing"; @Override - public void execute(Environment env, - Map params, TemplateModel[] loopVars, - TemplateDirectiveBody body) + public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) throws TemplateException, IOException { String fileParam = null; @@ -91,15 +89,14 @@ public class LoadFileDirective implements TemplateDirectiveModel { } } if (fileParam == null) { - throw new TemplateModelException( - "The required \"" + PARAM_FILE + "\" parameter" - + "is missing."); + throw new TemplateModelException("The required \"" + PARAM_FILE + "\" parameter" + "is missing."); } if (body != null) { throw new TemplateModelException("Body is not supported by this directive"); } Writer out = env.getOut(); - File baseDir = ((FileTemplateLoader)((Configuration)env.getTemplate().getParent()).getTemplateLoader()).baseDir; + File baseDir = + ((FileTemplateLoader) ((Configuration) env.getTemplate().getParent()).getTemplateLoader()).baseDir; File file = new File(baseDir, fileParam); if (file.exists()) { if (trimParam) { @@ -108,7 +105,7 @@ public class LoadFileDirective implements TemplateDirectiveModel { } else { IOUtils.copy(new FileInputStream(file), out, StandardCharsets.UTF_8); } - } else if (defaultParam != null ) { + } else if (defaultParam != null) { out.append(defaultParam).append("\n"); } else { throw new IOException("File not found: " + file); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/LicensedProjects.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/LicensedProjects.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/LicensedProjects.java index 952b91a..f6f9f32 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/LicensedProjects.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/LicensedProjects.java @@ -38,7 +38,7 @@ public class LicensedProjects { @JsonCreator public LicensedProjects(@JsonProperty("license") LicenseSpec license, - @JsonProperty("projects") Set<Project> projects) { + @JsonProperty("projects") Set<Project> projects) { this.license = license; this.projects.addAll(projects); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/Project.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/Project.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/Project.java index 80d4548..ff35162 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/Project.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/Project.java @@ -44,8 +44,8 @@ public class Project { @JsonIgnore private MavenProject mavenProject; - public static final Comparator<Project> PROJECT_COMPARATOR = (o1, o2) -> - o1.compareToken().compareTo(o2.compareToken()); + public static final Comparator<Project> PROJECT_COMPARATOR = + (o1, o2) -> o1.compareToken().compareTo(o2.compareToken()); public Project(MavenProject project, String location, File artifactPath) { mavenProject = project; @@ -60,10 +60,10 @@ public class Project { @JsonCreator public Project(@JsonProperty("name") String name, @JsonProperty("groupId") String groupId, - @JsonProperty("artifactId") String artifactId, @JsonProperty("url") String url, - @JsonProperty("version") String version, @JsonProperty("location") String location, - @JsonProperty("artifactPath") String artifactPath, @JsonProperty("noticeText") String noticeText, - @JsonProperty("licenseText") String licenseText) { + @JsonProperty("artifactId") String artifactId, @JsonProperty("url") String url, + @JsonProperty("version") String version, @JsonProperty("location") String location, + @JsonProperty("artifactPath") String artifactPath, @JsonProperty("noticeText") String noticeText, + @JsonProperty("licenseText") String licenseText) { this.name = name; this.groupId = groupId; this.artifactId = artifactId; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java index 81636de..286320b 100644 --- a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java +++ b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/MultiplexedConnection.java @@ -265,8 +265,8 @@ public class MultiplexedConnection implements ITCPConnectionEventListener { pendingWriteEventsCounter.decrement(); } BitSet pendingChannelCreditsBitmap = cSet.getPendingChannelCreditsBitmap(); - for (int j = pendingChannelCreditsBitmap.nextSetBit(0); j >= 0; j = pendingChannelCreditsBitmap - .nextSetBit(j)) { + for (int j = pendingChannelCreditsBitmap.nextSetBit(0); j >= 0; j = + pendingChannelCreditsBitmap.nextSetBit(j)) { writerState.command.setChannelId(j); writerState.command.setCommandType(MuxDemuxCommand.CommandType.ADD_CREDITS); ChannelControlBlock ccb = cSet.getCCB(j); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksVirtualCluster.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksVirtualCluster.java b/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksVirtualCluster.java index e1590e7..8aa5eab 100644 --- a/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksVirtualCluster.java +++ b/hyracks-fullstack/hyracks/hyracks-server/src/main/java/org/apache/hyracks/server/process/HyracksVirtualCluster.java @@ -83,4 +83,3 @@ public class HyracksVirtualCluster { } } } - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/src/main/java/org/apache/hyracks/storage/am/bloomfilter/impls/BloomCalculations.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/src/main/java/org/apache/hyracks/storage/am/bloomfilter/impls/BloomCalculations.java b/hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/src/main/java/org/apache/hyracks/storage/am/bloomfilter/impls/BloomCalculations.java index e0cf1a8..9525192 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/src/main/java/org/apache/hyracks/storage/am/bloomfilter/impls/BloomCalculations.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-bloomfilter/src/main/java/org/apache/hyracks/storage/am/bloomfilter/impls/BloomCalculations.java @@ -64,8 +64,8 @@ public class BloomCalculations { 0.000176 }, { 1.0, 0.0513, 0.00998, 0.00312, 0.0013, 0.000663, 0.000394, 0.000264, 0.000194, 0.000155, 0.000132, 0.000118, 0.000111, 0.000109 }, - { 1.0, 0.0488, 0.00906, 0.0027, 0.00108, 0.00053, 0.000303, 0.000196, 0.00014, 0.000108, 8.89e-05, - 7.77e-05, 7.12e-05, 6.79e-05, 6.71e-05 } // 20 + { 1.0, 0.0488, 0.00906, 0.0027, 0.00108, 0.00053, 0.000303, 0.000196, 0.00014, 0.000108, 8.89e-05, 7.77e-05, + 7.12e-05, 6.79e-05, 6.71e-05 } // 20 }; // the first column is a dummy column representing K=0. /** @@ -147,7 +147,8 @@ public class BloomCalculations { // we allocate one more bucket per element to compensate the effect introduced by using blocked bloom filter // a detail analysis can be found at https://dl.acm.org/citation.cfm?id=1594230 - return new BloomFilterSpecification(K, bucketsPerElement + 1); } + return new BloomFilterSpecification(K, bucketsPerElement + 1); + } /** * Calculates the maximum number of buckets per element that this implementation http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/compressors/FieldPrefixCompressor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/compressors/FieldPrefixCompressor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/compressors/FieldPrefixCompressor.java index 499a01a..86497a8 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/compressors/FieldPrefixCompressor.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/compressors/FieldPrefixCompressor.java @@ -228,8 +228,8 @@ public class FieldPrefixCompressor implements ITreeIndexFrameCompressor { } else { // segment has enough tuples: compress segment, extract prefix, // write prefix tuple to buffer, and set prefix slot - newPrefixSlots[newPrefixSlots.length - 1 - prefixTupleIndex] = slotManager - .encodeSlotFields(fieldCountToCompress, prefixFreeSpace); + newPrefixSlots[newPrefixSlots.length - 1 - prefixTupleIndex] = + slotManager.encodeSlotFields(fieldCountToCompress, prefixFreeSpace); prefixFreeSpace += tupleWriter.writeTupleFields(prevTuple, 0, fieldCountToCompress, byteBuffer.array(), prefixFreeSpace); @@ -237,8 +237,8 @@ public class FieldPrefixCompressor implements ITreeIndexFrameCompressor { for (int j = 0; j < tuplesInSegment; j++) { int currTupleIndex = segmentStart + j; tupleToWrite.resetByTupleIndex(frame, currTupleIndex); - newTupleSlots[tupleCount - 1 - currTupleIndex] = slotManager.encodeSlotFields( - prefixTupleIndex, tupleFreeSpace); + newTupleSlots[tupleCount - 1 - currTupleIndex] = + slotManager.encodeSlotFields(prefixTupleIndex, tupleFreeSpace); tupleFreeSpace += tupleWriter.writeTupleFields(tupleToWrite, fieldCountToCompress, fieldCount - fieldCountToCompress, byteBuffer.array(), tupleFreeSpace); } @@ -257,16 +257,16 @@ public class FieldPrefixCompressor implements ITreeIndexFrameCompressor { } else { // just write the tuple uncompressed tupleToWrite.resetByTupleIndex(frame, tupleIndex); - newTupleSlots[tupleCount - 1 - tupleIndex] = slotManager.encodeSlotFields( - FieldPrefixSlotManager.TUPLE_UNCOMPRESSED, tupleFreeSpace); + newTupleSlots[tupleCount - 1 - tupleIndex] = + slotManager.encodeSlotFields(FieldPrefixSlotManager.TUPLE_UNCOMPRESSED, tupleFreeSpace); tupleFreeSpace += tupleWriter.writeTuple(tupleToWrite, byteBuffer, tupleFreeSpace); uncompressedTupleCount++; } } else { // just write the tuple uncompressed tupleToWrite.resetByTupleIndex(frame, tupleIndex); - newTupleSlots[tupleCount - 1 - tupleIndex] = slotManager.encodeSlotFields( - FieldPrefixSlotManager.TUPLE_UNCOMPRESSED, tupleFreeSpace); + newTupleSlots[tupleCount - 1 - tupleIndex] = + slotManager.encodeSlotFields(FieldPrefixSlotManager.TUPLE_UNCOMPRESSED, tupleFreeSpace); tupleFreeSpace += tupleWriter.writeTuple(tupleToWrite, byteBuffer, tupleFreeSpace); uncompressedTupleCount++; } @@ -282,15 +282,16 @@ public class FieldPrefixCompressor implements ITreeIndexFrameCompressor { // this can happen to to the greedy solution of the knapsack-like problem // therefore, we check if the new space exceeds the page size to avoid the only danger of // an increasing space - int totalSpace = tupleFreeSpace + newTupleSlots.length * slotManager.getSlotSize() + newPrefixSlots.length - * slotManager.getSlotSize(); + int totalSpace = tupleFreeSpace + newTupleSlots.length * slotManager.getSlotSize() + + newPrefixSlots.length * slotManager.getSlotSize(); if (totalSpace > buf.capacity()) // just leave the page as is return false; // copy new tuple and new slots into original page int freeSpaceAfterInit = frame.getOrigFreeSpaceOff(); - System.arraycopy(buffer, freeSpaceAfterInit, pageArray, freeSpaceAfterInit, tupleFreeSpace - freeSpaceAfterInit); + System.arraycopy(buffer, freeSpaceAfterInit, pageArray, freeSpaceAfterInit, + tupleFreeSpace - freeSpaceAfterInit); // copy prefix slots int slotOffRunner = buf.capacity() - slotManager.getSlotSize(); @@ -363,9 +364,8 @@ public class FieldPrefixCompressor implements ITreeIndexFrameCompressor { kp.pmi[j].matches++; int prefixBytes = tupleWriter.bytesRequired(tuple, 0, prefixFieldsMatch); - int spaceBenefit = tupleWriter.bytesRequired(tuple) - - tupleWriter.bytesRequired(tuple, prefixFieldsMatch, tuple.getFieldCount() - - prefixFieldsMatch); + int spaceBenefit = tupleWriter.bytesRequired(tuple) - tupleWriter.bytesRequired(tuple, + prefixFieldsMatch, tuple.getFieldCount() - prefixFieldsMatch); if (kp.pmi[j].matches == occurrenceThreshold) { // if we compress this prefix, we pay the cost of storing it once, plus http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/FieldPrefixSlotManager.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/FieldPrefixSlotManager.java b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/FieldPrefixSlotManager.java index 8b64318..cd0a2d3 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/FieldPrefixSlotManager.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/FieldPrefixSlotManager.java @@ -57,7 +57,8 @@ public class FieldPrefixSlotManager implements IPrefixSlotManager { } // returns prefix slot number, or TUPLE_UNCOMPRESSED of no match was found - public int findPrefix(ITupleReference tuple, ITreeIndexTupleReference framePrefixTuple) throws HyracksDataException { + public int findPrefix(ITupleReference tuple, ITreeIndexTupleReference framePrefixTuple) + throws HyracksDataException { int prefixMid; int prefixBegin = 0; int prefixEnd = frame.getPrefixTupleCount() - 1; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IModificationOperationCallbackFactory.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IModificationOperationCallbackFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IModificationOperationCallbackFactory.java index d0f2358..cedd764 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IModificationOperationCallbackFactory.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IModificationOperationCallbackFactory.java @@ -28,7 +28,6 @@ import org.apache.hyracks.storage.common.LocalResource; @FunctionalInterface public interface IModificationOperationCallbackFactory extends Serializable { - IModificationOperationCallback createModificationOperationCallback(LocalResource resource, - IHyracksTaskContext ctx, IOperatorNodePushable operatorNodePushable) - throws HyracksDataException; + IModificationOperationCallback createModificationOperationCallback(LocalResource resource, IHyracksTaskContext ctx, + IOperatorNodePushable operatorNodePushable) throws HyracksDataException; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISearchOperationCallbackFactory.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISearchOperationCallbackFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISearchOperationCallbackFactory.java index 0a5eacc..c8020fc 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISearchOperationCallbackFactory.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISearchOperationCallbackFactory.java @@ -26,6 +26,6 @@ import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.storage.common.ISearchOperationCallback; public interface ISearchOperationCallbackFactory extends Serializable { - public ISearchOperationCallback createSearchOperationCallback(long resourceId, IHyracksTaskContext ctx, IOperatorNodePushable operatorNodePushable) - throws HyracksDataException; + public ISearchOperationCallback createSearchOperationCallback(long resourceId, IHyracksTaskContext ctx, + IOperatorNodePushable operatorNodePushable) throws HyracksDataException; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java index 3f8b6c1..90963bf 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java @@ -45,6 +45,5 @@ public interface ITreeIndexAccessor extends IIndexAccessor { * @throws HyracksDataException * If the BufferCache throws while un/pinning or un/latching. */ - public void diskOrderScan(ITreeIndexCursor cursor) - throws HyracksDataException; + public void diskOrderScan(ITreeIndexCursor cursor) throws HyracksDataException; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexCreateOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexCreateOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexCreateOperatorDescriptor.java index badcf27..898321b 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexCreateOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexCreateOperatorDescriptor.java @@ -32,8 +32,7 @@ public class IndexCreateOperatorDescriptor extends AbstractSingleActivityOperato private static final long serialVersionUID = 1L; private final IIndexBuilderFactory indexBuilderFactory; - public IndexCreateOperatorDescriptor(IOperatorDescriptorRegistry spec, - IIndexBuilderFactory indexBuilderFactory) { + public IndexCreateOperatorDescriptor(IOperatorDescriptorRegistry spec, IIndexBuilderFactory indexBuilderFactory) { super(spec, 0, 0); this.indexBuilderFactory = indexBuilderFactory; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java index f75144a..aae830d 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexDropOperatorNodePushable.java @@ -87,7 +87,7 @@ public class IndexDropOperatorNodePushable extends AbstractOperatorNodePushable return; } if (canRetry(e)) { - LOGGER.info( "Retrying drop on exception", e); + LOGGER.info("Retrying drop on exception", e); continue; } throw e; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java index f67424e..d55962a 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java @@ -181,8 +181,8 @@ public abstract class IndexSearchOperatorNodePushable extends AbstractUnaryInput ITupleReference tuple = cursor.getTuple(); writeTupleToOutput(tuple); if (appendIndexFilter) { - writeFilterTupleToOutput(((ILSMIndexCursor)cursor).getFilterMinTuple()); - writeFilterTupleToOutput(((ILSMIndexCursor)cursor).getFilterMaxTuple()); + writeFilterTupleToOutput(((ILSMIndexCursor) cursor).getFilterMinTuple()); + writeFilterTupleToOutput(((ILSMIndexCursor) cursor).getFilterMaxTuple()); } FrameUtils.appendToWriter(writer, appender, tb.getFieldEndOffsets(), tb.getByteArray(), 0, tb.getSize()); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java index 92ba631..70333ac 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java @@ -42,8 +42,7 @@ public abstract class AbstractSlotManager implements ISlotManager { @Override public int getSlotEndOff() { - return frame.getBuffer().capacity() - - (frame.getTupleCount() * slotSize); + return frame.getBuffer().capacity() - (frame.getTupleCount() * slotSize); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrame.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrame.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrame.java index de890c4..d0757c8 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrame.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrame.java @@ -76,8 +76,8 @@ public class LIFOMetaDataFrame implements ITreeIndexMetadataFrame { @Override public int getSpace() { - return buf.array().length - buf.getInt(Constants.FREE_SPACE_OFFSET) - (Integer.BYTES * buf.getInt( - FREE_PAGE_COUNT_OFFSET)); + return buf.array().length - buf.getInt(Constants.FREE_SPACE_OFFSET) + - (Integer.BYTES * buf.getInt(FREE_PAGE_COUNT_OFFSET)); } @Override @@ -209,8 +209,8 @@ public class LIFOMetaDataFrame implements ITreeIndexMetadataFrame { private boolean isInner(IValueReference key, int tupleOffset) { int keySize = buf.getInt(tupleOffset); if (keySize == key.getLength()) { - return LIFOMetaDataFrame.compare(key.getByteArray(), key.getStartOffset(), buf.array(), tupleOffset - + Integer.BYTES, keySize) == 0; + return LIFOMetaDataFrame.compare(key.getByteArray(), key.getStartOffset(), buf.array(), + tupleOffset + Integer.BYTES, keySize) == 0; } return false; } @@ -253,8 +253,8 @@ public class LIFOMetaDataFrame implements ITreeIndexMetadataFrame { int available = getSpace(); int required = key.getLength() + Integer.BYTES + Integer.BYTES + value.getLength(); if (available < required) { - throw new HyracksDataException("Available space in the page (" - + available + ") is not enough to store the key value pair(" + required + ")"); + throw new HyracksDataException("Available space in the page (" + available + + ") is not enough to store the key value pair(" + required + ")"); } buf.putInt(offset, key.getLength()); offset += Integer.BYTES; @@ -294,14 +294,14 @@ public class LIFOMetaDataFrame implements ITreeIndexMetadataFrame { @Override public String toString() { - StringBuilder aString = new StringBuilder(this.getClass().getSimpleName()).append('\n'). - append("Tuple Count: " + getTupleCount()).append('\n'). - append("Free Space offset: " + buf.getInt(Constants.FREE_SPACE_OFFSET)).append('\n'). - append("Level: " + buf.get(Constants.LEVEL_OFFSET)).append('\n'). - append("Version: " + buf.getInt(STORAGE_VERSION_OFFSET)).append('\n'). - append("Max Page: " + buf.getInt(MAX_PAGE_OFFSET)).append('\n'). - append("Root Page: " + buf.getInt(ROOT_PAGE_OFFSET)).append('\n'). - append("Number of free pages: " + buf.getInt(FREE_PAGE_COUNT_OFFSET)); + StringBuilder aString = new StringBuilder(this.getClass().getSimpleName()).append('\n') + .append("Tuple Count: " + getTupleCount()).append('\n') + .append("Free Space offset: " + buf.getInt(Constants.FREE_SPACE_OFFSET)).append('\n') + .append("Level: " + buf.get(Constants.LEVEL_OFFSET)).append('\n') + .append("Version: " + buf.getInt(STORAGE_VERSION_OFFSET)).append('\n') + .append("Max Page: " + buf.getInt(MAX_PAGE_OFFSET)).append('\n') + .append("Root Page: " + buf.getInt(ROOT_PAGE_OFFSET)).append('\n') + .append("Number of free pages: " + buf.getInt(FREE_PAGE_COUNT_OFFSET)); int tupleCount = getTupleCount(); int offset; for (int i = 0; i < tupleCount; i++) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/AppendOnlyLinkedMetadataPageManager.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/AppendOnlyLinkedMetadataPageManager.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/AppendOnlyLinkedMetadataPageManager.java index a051364..5c389d2 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/AppendOnlyLinkedMetadataPageManager.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/AppendOnlyLinkedMetadataPageManager.java @@ -345,10 +345,8 @@ public class AppendOnlyLinkedMetadataPageManager implements IMetadataPageManager try { frame.setPage(page); int inPageOffset = frame.getOffset(key); - return inPageOffset >= 0 - ? ((long) pageId * bufferCache.getPageSizeWithHeader()) + frame.getOffset(key) - + IBufferCache.RESERVED_HEADER_BYTES - : -1L; + return inPageOffset >= 0 ? ((long) pageId * bufferCache.getPageSizeWithHeader()) + frame.getOffset(key) + + IBufferCache.RESERVED_HEADER_BYTES : -1L; } finally { page.releaseReadLatch(); unpinPage(page); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/LinkedMetaDataPageManager.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/LinkedMetaDataPageManager.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/LinkedMetaDataPageManager.java index d8afd12..951d824 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/LinkedMetaDataPageManager.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/LinkedMetaDataPageManager.java @@ -240,8 +240,8 @@ public class LinkedMetaDataPageManager implements IMetadataPageManager { @Override public void close() throws HyracksDataException { if (ready) { - ICachedPage metaNode = bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, getMetadataPageId()), - false); + ICachedPage metaNode = + bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, getMetadataPageId()), false); ITreeIndexMetadataFrame metaFrame = frameFactory.createFrame(); metaNode.acquireWriteLatch(); try { @@ -319,8 +319,8 @@ public class LinkedMetaDataPageManager implements IMetadataPageManager { public long getFileOffset(ITreeIndexMetadataFrame frame, IValueReference key) throws HyracksDataException { int metadataPageNum = getMetadataPageId(); if (metadataPageNum != IBufferCache.INVALID_PAGEID) { - ICachedPage metaNode = bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, getMetadataPageId()), - false); + ICachedPage metaNode = + bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, getMetadataPageId()), false); metaNode.acquireReadLatch(); try { frame.setPage(metaNode); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/NoOpOperationCallback.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/NoOpOperationCallback.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/NoOpOperationCallback.java index 8245338..15aba57 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/NoOpOperationCallback.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/NoOpOperationCallback.java @@ -27,7 +27,7 @@ import org.apache.hyracks.storage.common.ISearchOperationCallback; /** * Dummy operation callback that simply does nothing. */ -public enum NoOpOperationCallback implements IModificationOperationCallback,ISearchOperationCallback { +public enum NoOpOperationCallback implements IModificationOperationCallback, ISearchOperationCallback { INSTANCE; @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/NoOpOperationCallbackFactory.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/NoOpOperationCallbackFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/NoOpOperationCallbackFactory.java index 4ef89d1..925642e 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/NoOpOperationCallbackFactory.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/NoOpOperationCallbackFactory.java @@ -36,7 +36,8 @@ public enum NoOpOperationCallbackFactory INSTANCE; @Override - public ISearchOperationCallback createSearchOperationCallback(long resourceId, IHyracksTaskContext ctx, IOperatorNodePushable operatorNodePushable) { + public ISearchOperationCallback createSearchOperationCallback(long resourceId, IHyracksTaskContext ctx, + IOperatorNodePushable operatorNodePushable) { return NoOpOperationCallback.INSTANCE; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java index ce2aa38..b192de7 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java @@ -20,5 +20,8 @@ package org.apache.hyracks.storage.am.common.ophelpers; public enum FindTupleMode { - INCLUSIVE, EXCLUSIVE, EXCLUSIVE_ERROR_IF_EXISTS, EXACT + INCLUSIVE, + EXCLUSIVE, + EXCLUSIVE_ERROR_IF_EXISTS, + EXACT } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java index e9dfaff..2081122 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java @@ -20,5 +20,7 @@ package org.apache.hyracks.storage.am.common.ophelpers; public enum FindTupleNoExactMatchPolicy { - LOWER_KEY, HIGHER_KEY, NONE + LOWER_KEY, + HIGHER_KEY, + NONE } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java index 609c51a..e82b037 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java @@ -98,7 +98,7 @@ public class SimpleTupleReference implements ITreeIndexTupleReference { @Override public int getTupleSize() { - return nullFlagsBytes + fieldSlotsBytes + ShortPointable.getShort(buf, tupleStartOff + nullFlagsBytes - + (fieldCount - 1) * 2); + return nullFlagsBytes + fieldSlotsBytes + + ShortPointable.getShort(buf, tupleStartOff + nullFlagsBytes + (fieldCount - 1) * 2); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java index 4ee9f53..ad0b030 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java @@ -75,41 +75,30 @@ public class TreeIndexStats { strBuilder.append("TREE LEVELS: " + treeLevels + "\n"); strBuilder.append("FREE PAGES : " + freePages + "\n"); strBuilder.append("META PAGES : " + metaPages + "\n"); - long totalPages = interiorStats.getNumPages() + leafStats.getNumPages() - + freePages + metaPages; + long totalPages = interiorStats.getNumPages() + leafStats.getNumPages() + freePages + metaPages; strBuilder.append("TOTAL PAGES : " + totalPages + "\n"); strBuilder.append("\n"); strBuilder.append("ROOT STATS" + "\n"); - strBuilder - .append("NUM TUPLES: " + rootStats.getNumTuples() + "\n"); - strBuilder.append("FILL FACTOR : " - + df.format(rootStats.getAvgFillFactor()) + "\n"); + strBuilder.append("NUM TUPLES: " + rootStats.getNumTuples() + "\n"); + strBuilder.append("FILL FACTOR : " + df.format(rootStats.getAvgFillFactor()) + "\n"); if (interiorStats.getNumPages() > 0) { strBuilder.append("\n"); strBuilder.append("INTERIOR STATS" + "\n"); - strBuilder.append("NUM PAGES: " + interiorStats.getNumPages() - + "\n"); - strBuilder.append("NUM TUPLES: " - + interiorStats.getNumTuples() + "\n"); - strBuilder.append("AVG TUPLES/PAGE: " - + df.format(interiorStats.getAvgNumTuples()) + "\n"); - strBuilder.append("AVG FILL FACTOR: " - + df.format(interiorStats.getAvgFillFactor()) + "\n"); + strBuilder.append("NUM PAGES: " + interiorStats.getNumPages() + "\n"); + strBuilder.append("NUM TUPLES: " + interiorStats.getNumTuples() + "\n"); + strBuilder.append("AVG TUPLES/PAGE: " + df.format(interiorStats.getAvgNumTuples()) + "\n"); + strBuilder.append("AVG FILL FACTOR: " + df.format(interiorStats.getAvgFillFactor()) + "\n"); } if (leafStats.getNumPages() > 0) { strBuilder.append("\n"); strBuilder.append("LEAF STATS" + "\n"); - strBuilder.append("NUM PAGES: " - + df.format(leafStats.getNumPages()) + "\n"); - strBuilder.append("NUM TUPLES: " - + df.format(leafStats.getNumTuples()) + "\n"); - strBuilder.append("AVG TUPLES/PAGE: " - + df.format(leafStats.getAvgNumTuples()) + "\n"); - strBuilder.append("AVG FILL FACTOR: " - + df.format(leafStats.getAvgFillFactor()) + "\n"); + strBuilder.append("NUM PAGES: " + df.format(leafStats.getNumPages()) + "\n"); + strBuilder.append("NUM TUPLES: " + df.format(leafStats.getNumTuples()) + "\n"); + strBuilder.append("AVG TUPLES/PAGE: " + df.format(leafStats.getAvgNumTuples()) + "\n"); + strBuilder.append("AVG FILL FACTOR: " + df.format(leafStats.getAvgFillFactor()) + "\n"); } return strBuilder.toString(); @@ -130,8 +119,7 @@ public class TreeIndexStats { public void add(ITreeIndexFrame frame) { numPages++; numTuples += frame.getTupleCount(); - sumFillFactors += (double) (frame.getBuffer().capacity() - frame - .getTotalFreeSpace()) + sumFillFactors += (double) (frame.getBuffer().capacity() - frame.getTotalFreeSpace()) / (double) frame.getBuffer().capacity(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java index 37ecfc0..ee31aaf 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java @@ -27,7 +27,8 @@ import org.apache.hyracks.storage.am.common.api.ITreeIndexTupleReference; @SuppressWarnings("rawtypes") public class TreeIndexUtils { - public static String printFrameTuples(ITreeIndexFrame frame, ISerializerDeserializer[] fieldSerdes) throws HyracksDataException { + public static String printFrameTuples(ITreeIndexFrame frame, ISerializerDeserializer[] fieldSerdes) + throws HyracksDataException { StringBuilder strBuilder = new StringBuilder(); ITreeIndexTupleReference tuple = frame.createTupleReference(); for (int i = 0; i < frame.getTupleCount(); i++) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/test/java/org/apache/hyracks/storage/am/common/frames/LIFOMetadataFrameTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/test/java/org/apache/hyracks/storage/am/common/frames/LIFOMetadataFrameTest.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/test/java/org/apache/hyracks/storage/am/common/frames/LIFOMetadataFrameTest.java index fbb930d..0df558f 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/test/java/org/apache/hyracks/storage/am/common/frames/LIFOMetadataFrameTest.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/test/java/org/apache/hyracks/storage/am/common/frames/LIFOMetadataFrameTest.java @@ -41,8 +41,7 @@ public class LIFOMetadataFrameTest { Assert.assertNull(longPointable.getByteArray()); byte[] longBytes = new byte[Long.BYTES]; MutableArrayValueReference value = new MutableArrayValueReference(longBytes); - int space = frame.getSpace() - (value.getLength() + Integer.BYTES * 2 - + testKey.getLength()); + int space = frame.getSpace() - (value.getLength() + Integer.BYTES * 2 + testKey.getLength()); for (long l = 1L; l < 52L; l++) { LongPointable.setLong(longBytes, 0, l); frame.put(testKey, value); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java index 482ad38..0593ad5 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java @@ -364,8 +364,7 @@ public class LSMBTree extends AbstractLSMIndex implements ITreeIndex { public LSMBTreeOpContext createOpContext(IModificationOperationCallback modificationCallback, ISearchOperationCallback searchCallback) { int numBloomFilterKeyFields = hasBloomFilter - ? ((LSMBTreeWithBloomFilterDiskComponentFactory) componentFactory).getBloomFilterKeyFields().length - : 0; + ? ((LSMBTreeWithBloomFilterDiskComponentFactory) componentFactory).getBloomFilterKeyFields().length : 0; return new LSMBTreeOpContext(this, memoryComponents, insertLeafFrameFactory, deleteLeafFrameFactory, modificationCallback, searchCallback, numBloomFilterKeyFields, getTreeFields(), getFilterFields(), getHarness(), getFilterCmpFactories(), tracer); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriter.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriter.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriter.java index 44002ae..7c924b5 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriter.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriter.java @@ -32,7 +32,7 @@ public class LSMBTreeCopyTupleWriter extends LSMBTreeTupleWriter { public int writeTuple(ITupleReference tuple, byte[] targetBuf, int targetOff) { int tupleSize = bytesRequired(tuple); byte[] buf = tuple.getFieldData(0); - int tupleStartOff = ((LSMBTreeTupleReference)tuple).getTupleStart(); + int tupleStartOff = ((LSMBTreeTupleReference) tuple).getTupleStart(); System.arraycopy(buf, tupleStartOff, targetBuf, targetOff, tupleSize); return tupleSize; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/freepage/VirtualFreePageManagerFactory.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/freepage/VirtualFreePageManagerFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/freepage/VirtualFreePageManagerFactory.java index 0d58b85..2ca162d 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/freepage/VirtualFreePageManagerFactory.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/freepage/VirtualFreePageManagerFactory.java @@ -24,6 +24,7 @@ import org.apache.hyracks.storage.common.buffercache.IBufferCache; public class VirtualFreePageManagerFactory implements IPageManagerFactory { private static final long serialVersionUID = 1L; + @Override public IPageManager createPageManager(IBufferCache bufferCache) { return new VirtualFreePageManager(bufferCache); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/FilterBulkLoader.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/FilterBulkLoader.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/FilterBulkLoader.java index 7359d2b..625f81e 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/FilterBulkLoader.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/FilterBulkLoader.java @@ -35,9 +35,8 @@ public class FilterBulkLoader implements IChainedComponentBulkLoader { protected final PermutingTupleReference filterTuple; protected final MultiComparator filterCmp; - public FilterBulkLoader(ILSMComponentFilter filter, ITreeIndex treeIndex, - ILSMComponentFilterManager filterManager, int[] indexFields, int[] filterFields, - MultiComparator filterCmp) { + public FilterBulkLoader(ILSMComponentFilter filter, ITreeIndex treeIndex, ILSMComponentFilterManager filterManager, + int[] indexFields, int[] filterFields, MultiComparator filterCmp) { this.filter = filter; this.treeIndex = treeIndex; this.filterManager = filterManager; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java index b2c48e1..fa3093c 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java @@ -298,9 +298,8 @@ public class LSMHarness implements ILSMHarness { if (!inactiveDiskComponents.isEmpty()) { for (ILSMDiskComponent inactiveComp : inactiveDiskComponents) { if (inactiveComp.getFileReferenceCount() == 1) { - inactiveDiskComponentsToBeDeleted = - inactiveDiskComponentsToBeDeleted == null ? new LinkedList<>() - : inactiveDiskComponentsToBeDeleted; + inactiveDiskComponentsToBeDeleted = inactiveDiskComponentsToBeDeleted == null + ? new LinkedList<>() : inactiveDiskComponentsToBeDeleted; inactiveDiskComponentsToBeDeleted.add(inactiveComp); } } @@ -627,8 +626,8 @@ public class LSMHarness implements ILSMHarness { boolean failedOperation = false; try { newComponent = lsmIndex.merge(operation); - operation.getCallback() - .afterOperation(LSMIOOperationType.MERGE, ctx.getComponentHolder(), newComponent); + operation.getCallback().afterOperation(LSMIOOperationType.MERGE, ctx.getComponentHolder(), + newComponent); newComponent.markAsValid(lsmIndex.isDurable()); } catch (Throwable e) { // NOSONAR: Log and re-throw failedOperation = true; @@ -808,8 +807,7 @@ public class LSMHarness implements ILSMHarness { } catch (InterruptedException e) { Thread.currentThread().interrupt(); if (LOGGER.isWarnEnabled()) { - LOGGER.log(Level.WARN, "Ignoring interrupt while waiting for lagging merge on " + lsmIndex, - e); + LOGGER.log(Level.WARN, "Ignoring interrupt while waiting for lagging merge on " + lsmIndex, e); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/PartitionedInMemoryInvertedIndexOpContext.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/PartitionedInMemoryInvertedIndexOpContext.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/PartitionedInMemoryInvertedIndexOpContext.java index bd82822..9cfaf7a 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/PartitionedInMemoryInvertedIndexOpContext.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/PartitionedInMemoryInvertedIndexOpContext.java @@ -34,7 +34,7 @@ public class PartitionedInMemoryInvertedIndexOpContext extends InMemoryInvertedI protected void setTokenizingTupleIterator() { IBinaryTokenizer tokenizer = getTokenizerFactory().createTokenizer(); - setTupleIter(new PartitionedInvertedIndexTokenizingTupleIterator(tokenCmpFactories.length, btree.getFieldCount() - - tokenCmpFactories.length, tokenizer)); + setTupleIter(new PartitionedInvertedIndexTokenizingTupleIterator(tokenCmpFactories.length, + btree.getFieldCount() - tokenCmpFactories.length, tokenizer)); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/FixedSizeElementInvertedListCursor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/FixedSizeElementInvertedListCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/FixedSizeElementInvertedListCursor.java index 56520b8..94ce348 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/FixedSizeElementInvertedListCursor.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/FixedSizeElementInvertedListCursor.java @@ -117,8 +117,8 @@ public class FixedSizeElementInvertedListCursor implements IInvertedListCursor { currentPageIx = binarySearch(elementIndexes, 0, numPages, elementIx); if (currentPageIx < 0) { - throw new IndexOutOfBoundsException("Requested index: " + elementIx + " from array with numElements: " - + numElements); + throw new IndexOutOfBoundsException( + "Requested index: " + elementIx + " from array with numElements: " + numElements); } if (currentPageIx == 0) { @@ -223,8 +223,8 @@ public class FixedSizeElementInvertedListCursor implements IInvertedListCursor { public String printCurrentElement(ISerializerDeserializer[] serdes) throws HyracksDataException { StringBuilder strBuilder = new StringBuilder(); for (int i = 0; i < tuple.getFieldCount(); i++) { - ByteArrayInputStream inStream = new ByteArrayInputStream(tuple.getFieldData(i), tuple.getFieldStart(i), - tuple.getFieldLength(i)); + ByteArrayInputStream inStream = + new ByteArrayInputStream(tuple.getFieldData(i), tuple.getFieldStart(i), tuple.getFieldLength(i)); DataInput dataIn = new DataInputStream(inStream); Object o = serdes[i].deserialize(dataIn); strBuilder.append(o.toString()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/ArrayListFactory.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/ArrayListFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/ArrayListFactory.java index 84c453b..5846e25 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/ArrayListFactory.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/ArrayListFactory.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import org.apache.hyracks.storage.am.lsm.invertedindex.api.IObjectFactory; -public class ArrayListFactory<T> implements IObjectFactory<ArrayList<T>>{ +public class ArrayListFactory<T> implements IObjectFactory<ArrayList<T>> { @Override public ArrayList<T> create() { return new ArrayList<T>(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/ConjunctiveEditDistanceSearchModifier.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/ConjunctiveEditDistanceSearchModifier.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/ConjunctiveEditDistanceSearchModifier.java index 6116322..decc499 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/ConjunctiveEditDistanceSearchModifier.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/ConjunctiveEditDistanceSearchModifier.java @@ -21,7 +21,6 @@ package org.apache.hyracks.storage.am.lsm.invertedindex.search; public class ConjunctiveEditDistanceSearchModifier extends EditDistanceSearchModifier { - public ConjunctiveEditDistanceSearchModifier(int gramLength, int edThresh) { super(gramLength, edThresh); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/TOccurrenceSearcher.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/TOccurrenceSearcher.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/TOccurrenceSearcher.java index 4269aa7..4c9f037 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/TOccurrenceSearcher.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/search/TOccurrenceSearcher.java @@ -34,8 +34,7 @@ public class TOccurrenceSearcher extends AbstractTOccurrenceSearcher { protected final ArrayList<IInvertedListCursor> invListCursors = new ArrayList<>(); - public TOccurrenceSearcher(IHyracksCommonContext ctx, IInPlaceInvertedIndex invIndex) - throws HyracksDataException { + public TOccurrenceSearcher(IHyracksCommonContext ctx, IInPlaceInvertedIndex invIndex) throws HyracksDataException { super(ctx, invIndex); }
