Fix store-smb split package (#73970)
Moves the implementation of this plugin from `o.e.i.store` and misc other places into `o.e.i.store.smb`.
This commit is contained in:
parent
602fb449b1
commit
319286664a
|
@ -17,8 +17,3 @@ restResources {
|
|||
include '_common', 'cluster', 'nodes', 'index', 'indices', 'get'
|
||||
}
|
||||
}
|
||||
|
||||
tasks.named('splitPackagesAudit').configure {
|
||||
// TODO: rename this package to be smb specific
|
||||
ignoreClasses 'org.elasticsearch.index.store.SmbDirectoryWrapper'
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
* Side Public License, v 1.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.index.store;
|
||||
package org.elasticsearch.index.store.smb;
|
||||
|
||||
import org.elasticsearch.action.search.SearchResponse;
|
||||
import org.elasticsearch.plugin.store.smb.SMBStorePlugin;
|
||||
|
@ -18,7 +18,7 @@ import java.util.Collection;
|
|||
|
||||
import static org.hamcrest.Matchers.is;
|
||||
|
||||
public abstract class AbstractAzureFsTestCase extends ESIntegTestCase {
|
||||
public abstract class AbstractAzureFsTestCase extends ESIntegTestCase {
|
||||
@Override
|
||||
protected Collection<Class<? extends Plugin>> nodePlugins() {
|
||||
return Arrays.asList(SMBStorePlugin.class);
|
|
@ -6,7 +6,7 @@
|
|||
* Side Public License, v 1.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.index.store;
|
||||
package org.elasticsearch.index.store.smb;
|
||||
|
||||
import org.elasticsearch.common.settings.Settings;
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
* Side Public License, v 1.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.index.store;
|
||||
package org.elasticsearch.index.store.smb;
|
||||
|
||||
import org.elasticsearch.common.settings.Settings;
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
* Side Public License, v 1.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.index.store;
|
||||
package org.elasticsearch.index.store.smb;
|
||||
|
||||
import org.apache.lucene.store.FSDirectory;
|
||||
import org.apache.lucene.store.FilterDirectory;
|
|
@ -6,7 +6,7 @@
|
|||
* Side Public License, v 1.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.index.store.smbmmapfs;
|
||||
package org.elasticsearch.index.store.smb;
|
||||
|
||||
import org.apache.lucene.store.Directory;
|
||||
import org.apache.lucene.store.LockFactory;
|
||||
|
@ -14,7 +14,6 @@ import org.apache.lucene.store.MMapDirectory;
|
|||
import org.elasticsearch.index.IndexModule;
|
||||
import org.elasticsearch.index.IndexSettings;
|
||||
import org.elasticsearch.index.store.FsDirectoryFactory;
|
||||
import org.elasticsearch.index.store.SmbDirectoryWrapper;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
|
@ -6,14 +6,13 @@
|
|||
* Side Public License, v 1.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.index.store.smbsimplefs;
|
||||
package org.elasticsearch.index.store.smb;
|
||||
|
||||
import org.apache.lucene.store.Directory;
|
||||
import org.apache.lucene.store.LockFactory;
|
||||
import org.apache.lucene.store.SimpleFSDirectory;
|
||||
import org.elasticsearch.index.IndexSettings;
|
||||
import org.elasticsearch.index.store.FsDirectoryFactory;
|
||||
import org.elasticsearch.index.store.SmbDirectoryWrapper;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
package org.elasticsearch.plugin.store.smb;
|
||||
|
||||
import org.elasticsearch.index.store.smbmmapfs.SmbMmapFsDirectoryFactory;
|
||||
import org.elasticsearch.index.store.smbsimplefs.SmbSimpleFsDirectoryFactory;
|
||||
import org.elasticsearch.index.store.smb.SmbMmapFsDirectoryFactory;
|
||||
import org.elasticsearch.index.store.smb.SmbSimpleFsDirectoryFactory;
|
||||
import org.elasticsearch.plugins.IndexStorePlugin;
|
||||
import org.elasticsearch.plugins.Plugin;
|
||||
|
||||
|
|
|
@ -6,12 +6,13 @@
|
|||
* Side Public License, v 1.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.index.store;
|
||||
package org.elasticsearch.index.store.smb;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
import org.apache.lucene.store.Directory;
|
||||
import org.apache.lucene.store.MMapDirectory;
|
||||
import org.elasticsearch.index.store.EsBaseDirectoryTestCase;
|
||||
|
||||
public class SmbMMapDirectoryTests extends EsBaseDirectoryTestCase {
|
||||
|
|
@ -6,12 +6,13 @@
|
|||
* Side Public License, v 1.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.index.store;
|
||||
package org.elasticsearch.index.store.smb;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
import org.apache.lucene.store.Directory;
|
||||
import org.apache.lucene.store.SimpleFSDirectory;
|
||||
import org.elasticsearch.index.store.EsBaseDirectoryTestCase;
|
||||
|
||||
public class SmbSimpleFSDirectoryTests extends EsBaseDirectoryTestCase {
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
* Side Public License, v 1.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.index.store;
|
||||
package org.elasticsearch.index.store.smb;
|
||||
|
||||
import com.carrotsearch.randomizedtesting.annotations.Name;
|
||||
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
|
Loading…
Reference in New Issue