Skip to content

Instantly share code, notes, and snippets.

Index: src/java/org/apache/lucene/search/ConjunctionDISI.java
===================================================================
--- src/java/org/apache/lucene/search/ConjunctionDISI.java (revision 1681184)
+++ src/java/org/apache/lucene/search/ConjunctionDISI.java (working copy)
@@ -38,13 +38,7 @@
final List<DocIdSetIterator> allIterators = new ArrayList<>();
final List<TwoPhaseIterator> twoPhaseIterators = new ArrayList<>();
for (DocIdSetIterator iter : iterators) {
- TwoPhaseIterator twoPhaseIter = TwoPhaseIterator.asTwoPhaseIterator(iter);
- if (twoPhaseIter != null) {
package org.apache.lucene.search;
/*
* 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
*
diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java b/core/src/main/java/org/el
index 3c306a1..4ce328b 100644
--- a/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java
+++ b/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java
@@ -169,6 +169,9 @@ public class JarHell {
if (clazz.equals("org.joda.time.base.BaseDateTime")) {
return; // apparently this is intentional... clean this up
}
+ if (clazz.startsWith("org.apache.maven.surefire")) {
+ return; // ridonculous
HashFunction (bwc)
BalancedShardsAllocator
HttpServerTransport
IndexQueryCache (should be test only)
InternalEngineFactory (should be test only)
IndexStoreModule
TransportService
Transport
diff --git a/dev-tools/src/main/resources/ant/integration-tests.xml b/dev-tools/src/main/resources/ant/integration-tests.xml
index 013a6d3..6889680 100644
--- a/dev-tools/src/main/resources/ant/integration-tests.xml
+++ b/dev-tools/src/main/resources/ant/integration-tests.xml
@@ -25,14 +25,18 @@
<tempfile property="temp.cwd" destDir="${integ.temp}"/>
<mkdir dir="${temp.cw
package org.elasticsearch.devtools
import com.carrotsearch.ant.tasks.junit4.JUnit4
import com.carrotsearch.ant.tasks.junit4.ListenersList
import com.carrotsearch.ant.tasks.junit4.dependencies.com.google.common.eventbus.Subscribe
import com.carrotsearch.ant.tasks.junit4.events.aggregated.AggregatedStartEvent
import com.carrotsearch.ant.tasks.junit4.listeners.AggregatedEventListener
import com.carrotsearch.ant.tasks.junit4.listeners.TextReport
import groovy.xml.NamespaceBuilder
import org.gradle.api.DefaultTask
package org.elasticsearch.devtools
import com.carrotsearch.ant.tasks.junit4.JUnit4
import com.carrotsearch.ant.tasks.junit4.ListenersList
import com.carrotsearch.ant.tasks.junit4.dependencies.com.google.common.eventbus.Subscribe
import com.carrotsearch.ant.tasks.junit4.events.aggregated.AggregatedStartEvent
import com.carrotsearch.ant.tasks.junit4.listeners.AggregatedEventListener
import com.carrotsearch.ant.tasks.junit4.listeners.TextReport
import groovy.xml.NamespaceBuilder
import org.gradle.api.DefaultTask
FAILURE: Build failed with an exception.
* Where:
Build file '/Users/rjernst/Code/es-gradle/core/build.gradle' line: 138
* What went wrong:
A problem occurred evaluating project ':core'.
> Could not find method slowTests() for arguments [build_c1r9i7u0m3mzmd8ci4x0bkl2i$_run_closure7_closure16_closure18@fe639a4] on project ':core'.
* Try:
FAILURE: Build failed with an exception.
* What went wrong:
Execution failed for task ':core:test'.
> java.lang.NullPointerException (no error message)
* Try:
Run with --debug option to get more log output.
* Exception is:
[15:25:59][~/Code/es-gradle/core]$ gradle test
:buildSrc:compileJava UP-TO-DATE
:buildSrc:compileGroovy UP-TO-DATE
:buildSrc:processResources UP-TO-DATE
:buildSrc:classes UP-TO-DATE
:buildSrc:jar UP-TO-DATE
:buildSrc:assemble UP-TO-DATE
:buildSrc:compileTestJava UP-TO-DATE
:buildSrc:compileTestGroovy UP-TO-DATE
:buildSrc:processTestResources UP-TO-DATE